support GBK (and X-GBK) encoding.

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

35 files changed, 15343 insertions, 15004 deletions

diff --git a/ChangeLog b/ChangeLog
index 409262aa..a2819ef1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2005-04-12
 
+	* src/compose.c
+	  src/messageview.c
+	  src/codeconv.[ch]
+	  src/prefs_common.c
+	  src/mainwindow.c: support GBK encoding. Fallback to GBK if "X-GBK"
+	  is passed (thanks to SuperMMX).
+
+2005-04-12
+
 	* src/compose.c: compose_write_to_file(): don't encode clearsigned
 	  text.
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 497ba8b3..a81a56f0 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,14 @@
 2005-04-12
 
+	* src/compose.c
+	  src/messageview.c
+	  src/codeconv.[ch]
+	  src/prefs_common.c
+	  src/mainwindow.c: GBK エンコーディングに対応。 "X-GBK" が渡された
+	  場合は GBK で代替するようにした(SuperMMX さん thanks)。
+
+2005-04-12
+
 	* src/compose.c: compose_write_to_file(): クリア署名されたテキストを
 	  エンコードしないようにした。
 
diff --git a/po/bg.po b/po/bg.po
index 00650ddd..b9a08692 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+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"
@@ -64,11 +64,11 @@ msgstr ""
 "仗��仂亞��舒仄舒��舒; 于 ��仍����舒亶, ��亠 仆亠 ����亠, 仂弍����仆亠��亠 ��亠 从��仄 Free Software Foundation, "
 "Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "丼亠��亠仆亠 仆舒 从仂仆��亳亞����舒��亳�� 亰舒 于��亠从亳 舒从舒��仆��...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -76,19 +76,19 @@ msgstr ""
 "��仄舒 仂��于仂��亠仆亳 仗��仂亰仂����亳 亰舒 ��������舒于�礌亠.\n"
 "��仂仍�� 亰舒��于仂��亠��亠 于��亳��从亳 仗��仂亰仂����亳 亰舒 ��������舒于�礌亠 仗��亠亟亳 ��亠亟舒从��亳�� 仆舒 舒从舒��仆��亳��亠."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "����于舒���礌亠 仆舒 仗��仂亰仂��亠�� 亰舒 ��亠亟舒从��亳�� 仆舒 舒从舒��仆��舒...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "弌��亰亟舒于舒仆亠 仆舒 仗��仂亰仂��亠�� 亰舒 ��亠亟舒从��亳�� 仆舒 舒从舒��仆��舒...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "��亠亟舒从��亳�� 仆舒 舒从舒��仆��亳��亠"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -96,8 +96,8 @@ msgstr ""
 "��舒 仆仂于亳 ����仂弍��亠仆亳�� ��亠 弍��亟亠 仗��仂于亠���磦舒仆仂 于 ��仂亰亳 ��亠亟. ����仄亠��仆亠��亠 从����亳亶从亳��亠\n"
 "于 从仂仍仂仆从舒 `G' 亰舒 ��舒亰��亠��舒于舒仆亠 仆舒 亳亰��亠亞仍�礌亠 仆舒 ����仂弍��亠仆亳����舒 仂�� `Get All'."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -105,60 +105,66 @@ msgstr ""
 msgid "Name"
 msgstr "��仄亠"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "����仂��仂从仂仍"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "弌����于����"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "��仂弍舒于�礌亠"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "��亠亟舒从��亳��舒仆亠"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " ��亰����亳于舒仆亠"
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "��舒亟仂仍��"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "��舒亞仂��亠"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " ��亰弍亳��舒仆亠 从舒��仂 舒从舒��仆�� 仗仂 仗仂亟��舒亰弍亳��舒仆亠"
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "��亠仍舒亠��亠 仍亳 亟舒 亳亰����亳亠��亠 ��仂亰亳 舒从舒��仆��?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "��亠仂亰舒亞仍舒于亠仆"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "��亰����亳于舒仆亠 仆舒 舒从舒��仆��"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "��亠仍舒亠��亠 仍亳 亟舒 亳亰����亳亠��亠 ��仂亰亳 舒从舒��仆��?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "��舒"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+��亠"
 
@@ -227,7 +233,7 @@ msgstr " ��亰仗��舒��舒仆亠"
 msgid "Abort"
 msgstr "����亠从��舒���磦舒仆亠"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -238,11 +244,11 @@ msgstr ""
 "(`%%h' ��亠 弍��亟亠 亰舒仄亠仆亠仆 �� 舒��亞��仄亠仆��舒)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "弌从��亳�� 仗仂����亠弍亳��亠仍��从亳 舒��亞��仄亠仆�� 仆舒 亟亠亶����于亳亠��仂"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -253,7 +259,7 @@ msgstr ""
 "(`%%u' ��亠 弍��亟亠 亰舒仄亠仆亠仆 �� 舒��亞��仄亠仆��舒)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "��仂����亠弍亳��亠仍��从亳 舒��亞��仄亠仆�� 仆舒 亟亠亶����于亳亠��仂"
 
@@ -261,7 +267,7 @@ msgstr "��仂����亠弍亳��亠仍��从亳 舒��亞��仄亠仆�� 仆舒 亟亠亶����于亳亠��仂"
 msgid "Add Address to Book"
 msgstr "��仂弍舒于�礌亠 仆舒 ��亟��亠��舒 从��仄 ��仆亳亞舒��舒"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "��亟��亠��"
@@ -347,8 +353,8 @@ msgstr "/_��亟��亠��/_��亠亟舒从��亳��舒仆亠"
 msgid "/_Address/_Delete"
 msgstr "/_��亟��亠��/_��亰����亳于舒仆亠"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_��仆��������仄亠仆��亳"
 
@@ -356,13 +362,13 @@ msgstr "/_��仆��������仄亠仆��亳"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_��仆��������仄亠仆��亳/��仆舒���礌亠 仆舒 _LDIF ��舒亶仍"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/_��仂仄仂��"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/_��仂仄仂��/_����仆仂��仆仂"
 
@@ -379,10 +385,10 @@ msgid "/New _Folder"
 msgstr "/��仂于舒 _��舒仗从舒"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -401,17 +407,17 @@ msgstr "/_��亰����亳于舒仆亠"
 msgid "E-Mail address"
 msgstr "E-Mail 舒亟��亠��"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "��亟��亠��仆舒 从仆亳亞舒"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "��仄亠:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -581,7 +587,7 @@ msgid "Group"
 msgstr "������仗舒"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "��舒仗从舒"
 
@@ -605,7 +611,7 @@ msgstr "����弍仍亳��亠仆 舒亟��亠��"
 msgid "Personal address"
 msgstr "��亳��亠仆 舒亟��亠��"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "��舒弍亠仍亠亢从舒"
 
@@ -613,7 +619,7 @@ msgstr "��舒弍亠仍亠亢从舒"
 msgid "Warning"
 msgstr "����亠亟��仗��亠亢亟亠仆亳亠"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "����亠��从舒"
 
@@ -625,31 +631,31 @@ msgstr "弌��亰亟舒于舒仆亠 仆舒 舒仍舒��仄亠仆 亟亳舒仍仂亞...\n"
 msgid "Show this message next time"
 msgstr "��仂从舒亰于舒仆亠 仆舒 ��仂于舒 ����仂弍��亠仆亳亠 ��仍亠亟于舒��亳�� 仗����"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "����舒仆亢亠于"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "丼亠��于亠仆"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "��仂亰仂于"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "��亠弍亠��仆仂 ��亳仆"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "弌亳仆"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "��亠仍亠仆"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "��舒���磦"
 
@@ -657,7 +663,7 @@ msgstr "��舒���磦"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "��亳从仂亶"
 
@@ -669,8 +675,8 @@ msgstr "/_��仂弍舒于�礌亠"
 msgid "/_Remove"
 msgstr "/_����亠仄舒��于舒仆亠"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/_��从��亠��仂舒��亳..."
 
@@ -835,8 +841,8 @@ msgstr "/_��亰亞仍亠亟/_����亞仂于仂�� 亟仂"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_��亰亞仍亠亟/---"
 
@@ -863,7 +869,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -946,140 +952,145 @@ msgstr "/_��亰亞仍亠亟/_��仂亟亳��舒仆亠/Simplified Chinese (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_��亰亞仍亠亟/_��仂亟亳��舒仆亠/Simplified Chinese (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_��亰亞仍亠亟/_��仂亟亳��舒仆亠/Traditional Chinese (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_��亰亞仍亠亟/_��仂亟亳��舒仆亠/Traditional Chinese (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_��亰亞仍亠亟/_��仂亟亳��舒仆亠/Korean (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_��亰亞仍亠亟/_��仂亟亳��舒仆亠/Thai (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_��亰亞仍亠亟/_��仂亟亳��舒仆亠/Thai (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_��仆��������仄亠仆��亳/_��亟��亠��仆舒 从仆亳亞舒"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_��仆��������仄亠仆��亳/_丿舒弍仍仂仆"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_��仆��������仄亠仆��亳/_��亠亶����于亳��"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_��仆��������仄亠仆��亳/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_��亠亟舒从��亳��舒仆亠/��亠亟舒从��亳��舒仆亠 �� _于��仆��亠仆 ��亠亟舒从��仂��"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_��仆��������仄亠仆��亳/_��亠亶����于亳��"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_弌��仂弍��亠仆亳亠/_����亳仗��亳��舒仆亠"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ��舒亶仍���� 仆亠 ������亠����于��于舒\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 仆舒仄亠��亳 ��亠从����仂于舒��舒 ��舒����\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "����亠��从舒 于 ��仂��仄舒��舒 仆舒 ��亳��舒��."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "����亠��从舒 于 reply/forward ��仂��仄舒��舒 仆舒 ����仂弍��亠仆亳亠��仂."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "个舒亶仍���� %s 仆亠 ������亠����于��于舒\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 仆舒仄亠��亳 亞仂仍亠仄亳仆舒��舒 仆舒 %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "个舒亶仍���� %s 亠 仗��舒亰亠仆."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 仗��仂��亠��亠 %s."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "弌��仂弍��亠仆亳亠: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 仆舒仄亠��亳 ��舒���� 仂�� multipart ����仂弍��亠仆亳亠."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [��亠亟舒从��亳��舒仆仂]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 弌������舒于�礌亠 仆舒 ����仂弍��亠仆亳亠%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "弌������舒于�礌亠 仆舒 ����仂弍��亠仆亳亠%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "��亠 亠 ��从舒亰舒仆 仗仂仍����舒��亠仍"
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "��亰仗��舒��舒仆亠"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "����舒亰仆舒 ��亠仄舒. ��亰仗��舒��舒仆亠 ��舒从舒?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 仗仂仍����亳 ��仗亳����从 �� 仗仂仍����舒��亠仍亳."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1087,26 +1098,26 @@ msgstr ""
 "��亠 亠 ��从舒亰舒仆 舒从舒��仆�� 亰舒 亳亰仗��舒��舒仆亠 仆舒 仗仂��舒��舒.\n"
 "��仂仍�� 亳亰弍亠��亠��亠 仗仂��亠仆��从�� 舒从舒��仆�� 仗��亠亟亳 亳亰仗��舒��舒仆亠."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "����亰仆亳从仆舒 亞��亠��从舒 仗��亳 仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳亠��仂 亟仂 %s."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 亰舒仗舒亰亳 ����仂弍��亠仆亳亠��仂 于 亳亰��仂亟����舒��舒 从����亳��."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "��亠 仄仂亢舒 亟舒 ��亠 仆舒仄亠��亳 弍����仂仆 舒��仂��亳亳��舒仆 �� 亳亰弍��舒仆亳�� `%s'."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 ��仄亠仆亳 于亳亟舒 仆舒 ��舒亶仍舒\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1116,140 +1127,140 @@ msgstr ""
 "%s 从��仄 %s.\n"
 "��亰仗��舒��舒仆亠 ��舒从舒?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 亰舒仗亳��舒�� ��亠亟����亳��亠\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 亳亰����亳亠 ����舒��仂��仂 ����仂弍��亠仆亳亠\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "仆舒��亠亢亟舒仆亠 仆舒 ����仂弍��亠仆亳亠��仂 仆舒 仂仗舒��从舒��舒...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 仆舒仄亠��亳 仗舒仗从舒��舒 亰舒 仂仗舒��从舒\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 仆舒��亠亟亳 ����仂弍��亠仆亳亠��仂 仆舒 仂仗舒��从舒��舒\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "亞亠仆亠��亳��舒仆仂 Message-ID: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "弌��亰亟舒于舒仆亠 仆舒 仗��仂亰仂��亠�� 亰舒 ��������舒于�礌亠...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME ��亳仗"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "��舒亰仄亠��"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "����:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "��亰仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳亠"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "��亰仗��舒��舒仆亠 仗仂-从����仆仂"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "��仂����舒于�礌亠 于 仗舒仗从舒��舒 亰舒 仂仗舒��从舒 亳 亳亰仗��舒��舒仆亠 仗仂-从����仆仂"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "丼亠��仆仂于亳"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "��舒仗舒亰于舒仆亠 于 仗舒仗从舒��舒 �� ��亠��仆仂于亳"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "��仄��从于舒仆亠"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "��仄��从于舒仆亠 仆舒 ��舒亶仍"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "����亳从��亠仗于舒仆亠"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "����亳从��亠仗于舒仆亠 仆舒 ��舒亶仍"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "弌亳亞仆舒������舒"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "��仄��从于舒仆亠 仆舒 ��亳亞仆舒������舒"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "��亠亟舒从��仂��"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "��亠亟舒从��亳�� �� 于��仆��亠仆 ��亠亟舒从��仂��"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "弌于亳于舒仆亠仆 仆舒 ��亠亟仂于亠��亠"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "弌于亳于舒仆亠 仆舒 于��亳��从亳 亟��仍亞亳 ��亠亟仂于亠"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "��亠于舒仍亳亟亠仆 MIME ��亳仗"
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "个舒亶仍���� 仆亠 ������亠����于��于舒 亳仍亳 亠 仗��舒亰亠仆"
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "��从��亠��仂舒��亳"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "��仂亟亳��舒仆亠"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "������"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "��仄亠 仆舒 ��舒亶仍"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "��仂仄舒仆亟仆亳�� ��亠亟 亰舒 于��仆��亠仆 ��亠亟舒从��仂�� 亠 仆亠于舒仍亳亟亠仆: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1260,72 +1271,72 @@ msgstr ""
 "��亠仍舒亠��亠 仍亳 仗��亳仆��亟亳��亠仍仆仂 仗��亠从��舒���磦舒仆亠 仆舒 仗��仂��亠��舒?\n"
 "process group id: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "����亠从��舒��亠仆 process group id: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "����亠仄亠仆亠仆 ��舒亶仍: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "弌������舒于�礌亠: 于��仂亟 仂�� 仆舒弍仍�ﾐ莞夷火委� 仗��仂��亠��\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 ����舒����亳��舒 于��仆��亠仆 ��亠亟舒从��仂��\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 亰舒仗亳��亠 于��于 ��舒亶仍\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "丼亠��亠仆亠 仆舒 pipe 仗��仂于舒仍亠仆仂\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 仆舒��亠亟亳 ����仂弍��亠仆亳亠��仂 仆舒 仂仗舒��从舒��舒."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "��亰弍仂�� 仆舒 ��舒亶仍"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "��亰弍仂�� 仆舒 ��舒亶仍"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "��亰仂����舒于�礌亠 仆舒 ����仂弍��亠仆亳亠"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "弌��仂弍��亠仆亳亠��仂 弍亠��亠 仗��仂仄亠仆亠仆仂. ��亰仂����舒于�礌亠?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "��亰仂����舒于�礌亠"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "仗��亳 丼亠��仆仂于亳"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "��亠仍舒亠��亠 仍亳 亟舒 仗��亳仍仂亢亳��亠 ��舒弍仍仂仆���� `%s' ?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "����亳仍舒亞舒仆亠 仆舒 ��舒弍仍仂仆"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "��舒仄亠仆�礌亠"
 
@@ -1486,12 +1497,12 @@ msgstr "��亠亟舒从��亳��舒仆亠 仆舒 仗舒仗从舒"
 msgid "Input the new name of folder:"
 msgstr "����于亠亟亠��亠 仆仂于仂��仂 亳仄亠 仆舒 仗舒仗从舒:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "��仂于舒 仗舒仗从舒"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "����于亠亟亠��亠 亳仄亠 仆舒 仆仂于舒 仗舒仗从舒:"
 
@@ -1660,162 +1671,158 @@ msgstr "仆亠����仗亠��仆仂 亰舒仗亳��于舒仆亠 仆舒 仆舒������仂亶从亳��亠 于��于
 msgid "Select folder"
 msgstr "��亰弍仂�� 仆舒 仗舒仗从舒"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "����仂亟����亳"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "��亰仗��舒��亠仆亳"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "��仗舒��从舒"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "��仂����亠"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "丼亠��仆仂于亳"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "��仂于舒��舒仗从舒"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' 仆亠 仄仂亢亠 亟舒 弍��亟亠 于从仍�ﾑ�亠仆仂 于 亳仄亠 仆舒 仗舒仗从舒"
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "��舒仗从舒��舒 `%s' 于亠��亠 ������亠����于��于舒"
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "��舒仗从舒��舒 `%s' 仆亠 仄仂亢亠 亟舒 弍��亟亠 ����亰亟舒亟亠仆舒."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/弌��亰亟舒于舒仆亠 仆舒 _仆仂于舒 仗舒仗从舒..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/_����亠亳仄亠仆��于舒仆亠 仆舒 仗舒仗从舒..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/_��亰����亳于舒仆亠 仆舒 仗舒仗从舒"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "��亰��亳����于舒仆亠 仆舒 从仂����亠��仂"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/_����仂于亠��从舒 亰舒 仆仂于亳 ����仂弍��亠仆亳��"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/_����亰仂弍仆仂于�磦舒仆亠 亟����于仂��仂 仆舒 仗舒仗从舒��舒"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/_丐������亠仆亠 仆舒 ����仂弍��亠仆亳��..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "���礆舒 仆亠仗��仂��亠��亠仆亳 ����仂弍��亠仆亳��."
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_��舒仗亳��于舒仆亠 于 仆仂于亳仆舒����从舒 亞����仗舒"
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/_����亠仄舒��于舒仆亠 仆舒 仆仂于亳仆舒����从舒 亞����仗舒"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "弌��亰亟舒于舒仆亠 仆舒 亳亰亞仍亠亟 仆舒 仗舒仗从舒...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "��仂于亳"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "��亠仗��仂��亠��亠仆亳"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "丕����舒仆仂于�磦舒仆亠 亳仆��仂��仄舒��亳�� 亰舒 仗舒仗从舒...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "丕����舒仆仂于�磦舒仆亠 亳仆��仂��仄舒��亳�� 亰舒 仗舒仗从舒..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "弌从舒仆亳��舒仆亠 仆舒 仗舒仗从舒 %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "弌从舒仆亳��舒仆亠 仆舒 仗舒仗从舒 %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "����亰仂弍仆仂于�磦舒仆亠 亟����于仂��仂 仆舒 仗舒仗从舒��舒"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "������于仂��仂 仆舒 仗舒仗从舒��舒 ��亠 弍��亟亠 于��亰仂弍仆仂于亠仆仂. ����仂亟��仍亢舒仆亠?"
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "����亰仂弍仆仂于�磦舒仆亠 亟����于仂��仂 仆舒 仗舒仗从舒��舒..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 msgid "Rebuilding of the folder tree failed."
 msgstr "����亰仂弍仆仂于�磦舒仆亠 仆舒 亟����于仂��仂 仆舒 仗舒仗从舒��舒 仗��仂于舒仍亠仆仂."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "����亰仂弍仆仂于�磦舒仆亠 仆舒 于��亳��从亳 亟����于亠��舒 仆舒 仗舒仗从亳..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "����仂于亠���磦舒仆亠 亰舒 仆仂于亳 ����仂弍��亠仆亳�� 于��于 于��亳��从亳 仗舒仗从亳..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "��舒仗从舒 %s 亠 亳亰弍��舒仆舒\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "��亰仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳亠..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "����亰仆亳从仆舒 亞��亠��从舒 仗��亳 仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳亠��仂 亟仂 %s."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1825,16 +1832,16 @@ msgstr ""
 "(舒从仂 亢亠仍舒亠��亠 亟舒 ����亰亟舒亟亠��亠 仗舒仗从舒 亰舒 ��������舒仆�磦舒仆亠 仆舒 仗仂亟仗舒仗从亳,\n"
 " 亟仂弍舒于亠��亠 `/' 仆舒 从��舒�� 仆舒 亳仄亠��仂)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "����于亠亟亠��亠 仆仂于仂 亳仄亠 亰舒 `%s'"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "����亠亳仄亠仆��于舒仆亠 仆舒 仗舒仗从舒"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1843,24 +1850,24 @@ msgstr ""
 "����亳��从亳 仗舒仗从亳 亳 ����仂弍��亠仆亳�� 仗仂亟 `%s' ��亠 弍��亟舒�� 亳亰����亳��亳.\n"
 "��舒亳����亳仆舒 仍亳 亢亠仍舒亠��亠 亳亰����亳于舒仆亠?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "��亰����亳于舒仆亠 仆舒 仗舒仗从舒"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "��舒仗从舒 `%s' 仆亠 仄仂亢亠 亟舒 ��亠 仗��亠仄舒��仆亠."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "��亰��亳����于舒仆亠 仆舒 从仂����亠��仂"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "��亠仍舒亠��亠 仍亳 亳亰��亳����于舒仆亠 仆舒 从仂����亠��仂?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1869,34 +1876,34 @@ msgstr ""
 "��亠仍舒亠��亠 仍亳 仗��亠仄舒��于舒仆亠 仆舒 仗仂��亠仆��从舒��舒 从����亳�� `%s'?\n"
 "(弌��仂弍��亠仆亳����舒 ���� ��亠 亳亰����亳于舒�� 仂�� 亟亳��从舒)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "����亠仄舒��于舒仆亠 仆舒 仗仂��亠仆��从舒 从����亳��"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "��亠仍舒亠��亠 仍亳 亳亰����亳于舒仆亠 仆舒 IMAP4 舒从舒��仆�� `%s'?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "��亰����亳于舒仆亠 仆舒 IMAP4 舒从舒��仆��"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "��亠仍舒亠��亠 仍亳 亳亰����亳于舒仆亠 仆舒 仆仂于亳仆舒����从舒 亞����仗舒 `%s'?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "��亰����亳于舒仆亠 仆舒 仆仂于亳仆舒����从舒 亞����仗舒"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "��亠仍舒亠��亠 仍亳 亳亰����亳于舒仆亠 仆舒 仆仂于亳仆舒����从亳 舒从舒��仆�� `%s'?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "��亰����亳于舒仆亠 仆舒 仆仂于亳仆舒����从亳 舒从舒��仆��"
 
@@ -1944,7 +1951,7 @@ msgstr "仆亠仗仂亰仆舒��"
 msgid "Can't retrieve newsgroup list."
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 仗仂仍����亳 ��仗亳����从 仆舒 仆仂于亳仆舒����从舒��舒 亞����仗舒"
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "��亰仗��仍仆亠仆仂."
 
@@ -2227,7 +2234,7 @@ msgstr "��仆舒���礌亠 仆舒 LDIF ��舒亶仍 于 ��亟��亠��仆舒��舒 从仆亳亞舒"
 msgid "Prev"
 msgstr "����亠亟亳��亠仆"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "弌仍亠亟于舒��"
 
@@ -2318,7 +2325,7 @@ msgstr "弌于����亰于舒仆亠 �� POP3 ������于����: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 ������舒仆仂于亳 于����亰从舒 �� POP3 ������于����: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "丕亟仂����仂于亠���磦舒仆亠..."
 
@@ -2348,7 +2355,7 @@ msgstr "��亰亳仄舒仆亠 仆舒 ��舒亰仄亠������ 仆舒 ����仂弍��亠仆亳����舒 (LIST).
 msgid "Deleting message %d"
 msgstr "��亰����亳于舒仆亠 仆舒 ����仂弍��亠仆亳亠 %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "����亠从����于舒仆亠"
 
@@ -2391,7 +2398,8 @@ msgstr "个舒亶仍���� 仆亠 仄仂亢亠 亟舒 ��亠 亰舒仗亳��亠."
 msgid "Socket error."
 msgstr "����亠��从舒 于 ��仂从亠��."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "������亰从舒��舒 亠 仗��亠从��舒��亠仆舒 仂�� 仂��亟舒仍亠��亠仆亳�� ��仂����."
 
@@ -2408,11 +2416,11 @@ msgstr ""
 "��仂��亠仆��从舒��舒 从����亳�� 亠 亰舒从仍�ﾑ�亠仆舒:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "丕亟仂����仂于亠���磦舒仆亠��仂 ��亠 仗��仂于舒仍亳."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2421,7 +2429,7 @@ msgstr ""
 "丕亟仂����仂于亠���磦舒仆亠��仂 ��亠 仗��仂于舒仍亳:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 #, fuzzy
 msgid "Session timed out."
 msgstr "��亠��亳����舒 亠 仗��仂����仂��亠仆舒\n"
@@ -2845,329 +2853,329 @@ msgstr "/_��亰亞仍亠亟/_��仂亟亳��舒仆亠/Japanese (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_��亰亞仍亠亟/_��仂亟亳��舒仆亠/Japanese (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_��亰亞仍亠亟/_��仂亟亳��舒仆亠/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_��亰亞仍亠亟/_��仂亟亳��舒仆亠/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_��亰亞仍亠亟/����于舒���礌亠 于 _仆仂于 仗��仂亰仂��亠��"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_��亰亞仍亠亟/_��亰��仂亟亠仆 从仂亟"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_��亰亞仍亠亟/_��仂从舒亰于舒仆亠 仆舒 亰舒亞仍舒于仆亳��亠 ��舒����亳(headers)"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_��亰亞仍亠亟/_��弍仆仂于�磦舒仆亠 仆舒 亳亰于舒亟从舒��舒"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_弌��仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_弌��仂弍��亠仆亳亠/_��亠亟舒从��亳��舒仆亠"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_弌��仂弍��亠仆亳亠/��仂仍����舒于舒仆亠 仂�� _于��亳��从亳 舒从舒��仆��亳"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_弌��仂弍��亠仆亳亠/��仂仍����舒于舒仆亠 仂�� _于��亳��从亳 舒从舒��仆��亳"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_弌��仂弍��亠仆亳亠/_����从舒亰 仆舒 仗仂仍����舒于舒仆亠"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_弌��仂弍��亠仆亳亠/---"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/_弌��仂弍��亠仆亳亠/_��亰仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳����舒 于 仂仗舒��从舒��舒"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_弌��仂弍��亠仆亳亠/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_弌��仂弍��亠仆亳亠/_弌������舒于�礌亠 仆舒 仆仂于仂 ����仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_弌��仂弍��亠仆亳亠/_����亞仂于仂��"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/_弌��仂弍��亠仆亳亠/����亞仂于仂�� _亟仂"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_弌��仂弍��亠仆亳亠/����亞仂于仂�� _亟仂/_于��亳��从亳"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_弌��仂弍��亠仆亳亠/����亞仂于仂�� _亟仂/_仗仂亟舒��亠仍"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_弌��仂弍��亠仆亳亠/����亞仂于仂�� _亟仂/_仗仂��亠仆��从亳 ��仗亳����从"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/_弌��仂弍��亠仆亳亠/��_��亠仗��舒��舒仆亠"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/_弌��仂弍��亠仆亳亠/����_亠仗��舒��舒仆亠 从舒��仂 仗��亳������从舒"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/_弌��仂弍��亠仆亳亠/_����亠仆舒��仂��于舒仆亠"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_弌��仂弍��亠仆亳亠/_����亠仄亠����于舒仆亠"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/_弌��仂弍��亠仆亳亠/_��仂仗亳��舒仆亠"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_弌��仂弍��亠仆亳亠/_��亰����亳于舒仆亠"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_弌��仂弍��亠仆亳亠/_��舒��从亳��舒仆亠"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_弌��仂弍��亠仆亳亠/_��舒��从亳��舒仆亠/_��舒��从亳��舒仆亠"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_弌��仂弍��亠仆亳亠/_��舒��从亳��舒仆亠/_��舒亰仄舒��从亳��舒仆亠"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_弌��仂弍��亠仆亳亠/_��舒��从亳��舒仆亠/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_弌��仂弍��亠仆亳亠/_��舒��从亳��舒仆亠/从舒��仂 _仆亠仗��仂��亠��亠仆仂"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_弌��仂弍��亠仆亳亠/_��舒��从亳��舒仆亠/从舒��仂 _仗��仂��亠��亠仆仂"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_弌��仂弍��亠仆亳亠/_��舒��从亳��舒仆亠/_于��亳��从亳 从舒��仂 仗��仂��亠��亠仆亳"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/_弌��仂弍��亠仆亳亠/_��亠亟舒从��亳��舒仆亠"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_��仆��������仄亠仆��亳/_��仂弍舒于�礌亠 仆舒 仗仂亟舒��亠仍 于 舒亟��亠��仆舒��舒 从仆亳亞舒"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_��仆��������仄亠仆��亳/_个亳仍����亳��舒仆亠 仆舒 ����仂弍��亠仆亳����舒"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_��仆��������仄亠仆��亳/_个亳仍����亳��舒仆亠 仆舒 ����仂弍��亠仆亳����舒"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_��仆��������仄亠仆��亳/_弌��亰亟舒于舒仆亠 仆舒 仗��舒于亳仍仂 亰舒 ��亳仍����亳��舒仆亠"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_��仆��������仄亠仆��亳/_弌��亰亟舒于舒仆亠 仆舒 仗��舒于亳仍仂 亰舒 ��亳仍����亳��舒仆亠/_��于��仂仄舒��亳��仆仂"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_��仆��������仄亠仆��亳/_弌��亰亟舒于舒仆亠 仆舒 仗��舒于亳仍仂 亰舒 ��亳仍����亳��舒仆亠/仗仂 _��仂亟舒��亠仍"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_��仆��������仄亠仆��亳/_弌��亰亟舒于舒仆亠 仆舒 仗��舒于亳仍仂 亰舒 ��亳仍����亳��舒仆亠/仗仂 ��_仂仍����舒��亠仍"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_��仆��������仄亠仆��亳/_弌��亰亟舒于舒仆亠 仆舒 仗��舒于亳仍仂 亰舒 ��亳仍����亳��舒仆亠/仗仂 _丐亠仄舒"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_��仆��������仄亠仆��亳/��_亰����亳于舒仆亠 仆舒 仗仂于��舒������亳 ��亠 ����仂弍��亠仆亳��"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_��仆��������仄亠仆��亳/_��亰仗��仍仆亠仆亳亠"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/_��仆��������仄亠仆��亳/_������仆舒仍亠仆 仗��仂亰仂��亠��"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_��仂仆��亳亞����亳��舒仆亠"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_��仂仆��亳亞����亳��舒仆亠/_��弍��亳 仗��亠亟仗仂��亳��舒仆亳��"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_��仂仆��亳亞����亳��舒仆亠/_丕����舒仆仂于�磦舒仆亠 仆舒 ��亳仍������"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_��仂仆��亳亞����亳��舒仆亠/_丿舒弍仍仂仆"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_��仂仆��亳亞����亳��舒仆亠/_��亠亶����于亳��"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_��仂仆��亳亞����亳��舒仆亠/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_��仂仆��亳亞����亳��舒仆亠/_����亠亟仗仂��亳��舒仆亳�� 亰舒 ��亠从����亳�� 舒从舒��仆��"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_��仂仆��亳亞����亳��舒仆亠/_弌��亰亟舒于舒仆亠 仆舒 仆仂于 舒从舒��仆��"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_��仂仆��亳亞����亳��舒仆亠/_��亠亟舒从��亳��舒仆亠 仆舒 舒从舒��仆��亳��亠"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_��仂仆��亳亞����亳��舒仆亠/弌_仄�礌舒 仆舒 ��亠从����亳�� 舒从舒��仆��"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_��仂仄仂��/_��舒������仆亳从"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_��仂仄仂��/_��舒������仆亳从/_��仆亞仍亳亶��从亳"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_��仂仄仂��/_��舒������仆亳从/_亊仗仂仆��从亳"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/_��仂仄仂��/_丼亠����亳 于��仗��仂��亳"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/_��仂仄仂��/_丼亠����亳 于��仗��仂��亳/_��仆亞仍亳亶��从亳"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/_��仂仄仂��/_丼亠����亳 于��仗��仂��亳/_��亠仄��从亳"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_��仂仄仂��/_丼亠����亳 于��仗��仂��亳/_����仗舒仆��从亳"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/_��仂仄仂��/_丼亠����亳 于��仗��仂��亳/_个��亠仆��从亳"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_��仂仄仂��/_丼亠����亳 于��仗��仂��亳/_����舒仍亳舒仆��从亳"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_��仂仄仂��/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "弌��亰亟舒于舒仆亠 仆舒 亞仍舒于亠仆 仗��仂亰仂��亠��...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "亞仂��仂于仂.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "��亠仂亰舒亞仍舒于亠仆"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "仍亳仗��于舒"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "����仂仄�礌舒 仆舒 ��舒亰亟亠仍亠仆亳亠��仂 仆舒 仗��仂亰仂��亠��舒 仂�� %d 亟仂 %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr "��亠亰 亟仂������仗 亟仂 仄��亠亢舒"
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr "��舒弍仂��亳��亠 弍亠亰 亟仂������仗 亟仂 仄��亠亢舒. ��亠仍舒亠��亠 仍亳 亟舒 于从仍�ﾑ�亳��亠 仄��亠亢舒��舒?"
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "��亰��亳����于舒仆亠 仆舒 从仂����亠��仂"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "��亠仍舒亠��亠 仍亳 亳亰��亳����于舒仆亠 仆舒 从仂����亠��仂?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "��仂弍舒于�礌亠 仆舒 仗仂��亠仆��从舒 从����亳��"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3177,16 +3185,16 @@ msgstr ""
 "��从仂 亠 ��从舒亰舒仆舒 ������亠����于��于舒��舒 从����亳��, ���� ��亠 弍��亟亠\n"
 "��从舒仆亳��舒仆舒 舒于��仂仄舒��亳��仆仂."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "��亠��亠 ������亠����于��于舒 仗仂��亠仆��从舒 从����亳�� `%s'."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "��仂��亠仆��从舒 从����亳��"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3195,144 +3203,144 @@ msgstr ""
 "弌��亰亟舒于舒仆亠��仂 仆舒 仗仂��亠仆��从舒 从����亳�� ��亠 仗��仂于舒仍亳.\n"
 "��亠��亠 ������亠����于��于舒�� 仆�磻舒从于亳 ��舒亶仍仂于亠, 亳仍亳 仆�礆舒��亠 仗��舒于舒 亰舒 亰舒仗亳��."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - ��亰亞仍亠亟 仆舒 仗舒仗从亳��亠"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ��亰亞仍亠亟 仆舒 ����仂弍��亠仆亳����舒"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_����亞仂于仂��"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "����亞仂于舒���礌亠 仆舒 于��亳��从亳"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/����亞仂于仂�� _亟仂/_仗仂亟舒��亠仍"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/����亞仂于仂�� _亟仂/仗仂��亠仆��从亳 _��仗亳����从"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_����亠仗��舒��舒仆亠"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/����_亠仗��舒��舒仆亠 从舒��仂 仗��亳������从舒"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/��_��亠仆舒��仂��于舒仆亠"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "��仂仍����舒于舒仆亠"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "����亳亠仄舒仆亠 仆舒 仆仂于舒 仗仂��舒"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "��仂仍����舒于舒仆亠 仂�� 于��亳��从亳"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "����亳亠仄舒仆亠 仆舒 仆仂于舒 仗仂��舒 仂�� 于��亳��从亳 舒从舒��仆��亳"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "��亰仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳����舒 于 仂仗舒��从舒��舒"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "弌������舒于�礌亠"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "弌������舒于�礌亠 仆舒 仆仂于仂 ����仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "����亞仂于舒���礌亠"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "����亞仂于舒���礌亠 仆舒 ����仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "��舒 于��亳��从亳"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "����亞仂于舒���礌亠 仆舒 于��亳��从亳"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "����亠仗��舒��舒仆亠"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "����亠仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳亠��仂"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "��亰����亳于舒仆亠 仆舒 ����仂弍��亠仆亳亠��仂"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "��亰仗��仍仆�磦舒仆亠"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "��亰仗��仍仆�磦舒仆亠 仆舒 仄舒��从亳��舒仆亳�� 仗��仂��亠��"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "弌仍亠亟于舒��仂 仆亠仗��仂��亠��亠仆仂 ����仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "����亠亟仗仂��亳��舒仆亳��"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "��弍��亳 仗��亠亟仗仂��亳��舒仆亳��"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "��从舒��仆��"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "��仂仆��亳亞����亳��舒仆亠 仆舒 舒从舒��仆��"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr "��舒弍仂��亳��亠 弍亠亰 亟仂������仗 亟仂 仄��亠亢舒. 乂��舒从仆亠��亠 亳从仂仆舒��舒 亰舒 亟舒 于从仍�ﾑ�亳��亠 仄��亠亢舒��舒."
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr "��舒弍仂��亳��亠 �� 亟仂������仗 亟仂 仄��亠亢舒. 乂��舒从仆亠��亠 亳从仂仆舒��舒 亰舒 亟舒 亳亰从仍�ﾑ�亳��亠 仄��亠亢舒��舒."
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "��亰��仂亟"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "��亠仍舒亠��亠 仍亳 亳亰��仂亟 仂�� 仗��仂亞��舒仄舒��舒?"
 
@@ -3452,28 +3460,28 @@ msgstr "��仂����亳亞仆舒�� 亠 从��舒���� 仆舒 ����仂弍��亠仆亳亠��仂; 仗��仂亟��
 msgid "Search finished"
 msgstr "丐������亠仆亠��仂 仗��亳从仍�ﾑ�亳"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "弌��亰亟舒于舒仆亠 仆舒 亳亰亞仍亠亟 仆舒 ����仂弍��亠仆亳����仂...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "丐亠从����"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "����亳������从亳"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "��亠 仄仂亢亠 亟舒 ��亠 亰舒仗舒亰亳 ��舒亶仍���� `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "��亠��舒��"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3482,7 +3490,7 @@ msgstr ""
 "����于亠亟亠��亠 从仂仄舒仆亟仆亳�� ��亠亟 亰舒 仗亠��舒��:\n"
 "(`%s' ��亠 弍��亟亠 亰舒仄亠仆亠仆 �� 亳仄亠 仆舒 ��舒亶仍)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3924,7 +3932,7 @@ msgstr "��亰��亠亞仍�礌亠 仆舒 于��亳��从亳 ����仂弍��亠仆亳�� 仂�� ������于���
 msgid "Receive size limit"
 msgstr "��亞��舒仆亳��亠仆亳亠 仆舒 ��舒亰仄亠��舒 仗��亳 仗仂仍����舒于舒仆亠"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "��B"
 
@@ -3944,7 +3952,7 @@ msgstr "(��亠��亳仍����亳��舒仆亳��亠 ����仂弍��亠仆亳�� ��亠 弍��亟舒�� �������
 msgid "Authentication method"
 msgstr "��亠��仂亟 仆舒 ��亟仂����仂于亠���磦舒仆亠"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "��于��仂仄舒��亳��仆仂"
 
@@ -3968,7 +3976,7 @@ msgstr "��亠仆亠��亳��舒仆亠 仆舒 Message-ID"
 msgid "Add user-defined header"
 msgstr "��仂弍舒于�礌亠 仆舒 亰舒亞仍舒于仆舒 ��舒���� 仂�� 仗仂����亠弍亳��亠仍��"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " ��亠亟舒从��亳��舒仆亠... "
 
@@ -4441,30 +4449,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "��仗��仂����亠仆 从亳��舒亶��从亳 (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "��仗��仂����亠仆 从亳��舒亶��从亳 (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "丐��舒亟亳��亳仂仆亠仆 从亳��舒亶��从亳 (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "丐��舒亟亳��亳仂仆亠仆 从亳��舒亶��从亳 (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "��亳��舒亶��从亳 (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "��仂��亠亶��从亳 (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "丐舒亶仍舒仆亟��从亳 (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "丐舒亶仍舒仆亟��从亳 (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4473,11 +4486,11 @@ msgstr ""
 "��从仂 亠 亳亰弍��舒仆仂 `��于��仂仄舒��亳��仆仂', ��亠 弍��亟亠 亳亰弍��舒仆仂\n"
 "仂仗��亳仄舒仍仆仂��仂 亰舒 ��亠从����亳�� 仍仂从舒仍 从仂亟亳��舒仆亠."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "����亠仆仂��仆仂 从仂亟亳��舒仆亠"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4486,118 +4499,118 @@ msgstr ""
 "丕从舒亢亠��亠 ����亠仆仂��仆仂 ��仂亟亳��舒仆亠 仆舒 弌��亟����亢舒仆亳亠��仂(Content-Transfer-Encoding)\n"
 "亳亰仗仂仍亰于舒仆仂 从仂亞舒��仂 ���磿仂��仂 仆舒 ����仂弍��亠仆亳亠��仂 ����亟����亢舒 仆亠-ASCII 亰仆舒��亳."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "��舒亰亟亠仍亳��亠仍 仆舒 ��亳亞仆舒������舒��舒"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "��于��仂仄舒��亳��仆仂 于仄��从于舒仆亠"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "��于��仂仄舒��亳��仆仂 ����舒����亳��舒仆亠 仆舒 于��仆��亠仆 ��亠亟舒从��仂��"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "��亳于仂 仆舒 仂��仄�礌舒"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "����亠仆舒���礌亠 仆舒 ����仂弍��亠仆亳����舒 仆舒"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "亰仆舒从舒"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "����亠仆舒���礌亠 仆舒 ��亳��舒��"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "����亠仆舒���礌亠 仗��亳 于��于亠亢亟舒仆亠"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "����亠仆舒���礌亠 仗��亠亟亳 亳亰仗��舒��舒仆亠"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "��于��仂仄舒��亳��仆仂 亳亰弍亳��舒仆亠 仆舒 舒从舒��仆�� 亰舒 仂��亞仂于仂��"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "丶亳��亳��舒仆亠 仆舒 ����仂弍��亠仆亳亠��仂 仗��亳 仂��亞仂于舒���礌亠"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "������仂仆舒 亰舒 仂��亞仂于仂�� 亳亰仗��仍仆�磦舒 仂��亞仂于仂�� 亟仂 仗仂��亠仆��从亳 ��仗亳����从"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "个仂��仄舒�� 仆舒 仂��亞仂于仂��舒"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "��舒��从亳��舒仆亠 仆舒 ��亳��舒��"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "个仂��仄舒�� 仆舒 仗��亠仗��舒��舒仆亠"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " ��仗亳��舒仆亳亠 仆舒 ��亳仄于仂仍亳��亠 "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "丿��亳����"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "����亠于亠亢亟舒仆亠 仆舒 亳仄亠 仆舒 亰舒亞仍舒于仆舒 ��舒���� (从舒��仂 'From:', 'Subject:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "��仂从舒亰于舒仆亠 仆舒 弍��仂�� 仆舒 仆亠仗��仂��亠��亠仆亳��亠 亟仂 亳仄亠��仂 仆舒 仗舒仗从舒��舒"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "弌��从��舒��舒于舒仆亠 仆舒 仆仂于亳仆舒����从亳 亞����仗亳 仗仂 亟��仍亞亳 仂��"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "弍��从于亳"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "��亰亞仍亠亟 仆舒 亳亰于舒亟从舒��舒"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "��仂从舒亰于舒仆亠 仆舒 仗仂仍����舒��亠仍�� 于 `����' 从仂仍仂仆舒��舒, 舒从仂 亳亰仗��舒��舒��舒 ����亠 于亳亠"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "��舒亰于亳于舒仆亠 仆舒 仆亳��从亳��亠..."
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "个仂��仄舒�� 仆舒 亟舒��舒��舒"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr "��仗��亠亟亠仍�礌亠 仆舒 舒����亳弍����亳 仆舒 亳亰于舒亟从舒��舒"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "��仂亰于仂仍�磦舒仆亠 仆舒 仂��于亠���磦舒仆亠 仆舒 ����仂弍��亠仆亳亠"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4605,328 +4618,328 @@ msgstr ""
 "��仂从舒亰于舒仆亠 仆舒 multi-byte 舒亰弍��从舒 亳 ��亳����亳 从舒��仂\n"
 "ASCII 亰仆舒��亳 (��舒仄仂 亰舒 亊仗仂仆��从亳)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "��舒仆亠仍 ������ 亰舒亞仍舒于仆舒 ��舒���� 仆舒亟 亳亰亞仍亠亟舒 仆舒 ����仂弍��亠仆亳亠��仂"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "��仂从舒亰于舒仆亠 仆舒 从��舒��从亳 亰舒亞仍舒于仆亳 ��舒����亳 于 亳亰亞仍亠亟舒 仆舒 ����仂弍��亠仆亳亠��仂"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "��舒亰����仂�礌亳亠 仄/�� ��亠亟仂于亠��亠"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "仗亳从��亠仍(舒)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "����亠于������舒仆亠"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "��仂仍仂于亳仆 ������舒仆亳��舒"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "��仍舒于仆仂 仗��亠于������舒仆亠"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "弌����仗从舒"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "��舒亰仗��于舒仆亠 仆舒 仗��亳从��亠仗亠仆亳 亳亰仂弍��舒亢亠仆亳��"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "��舒������仂亶从舒 仆舒 仗仂从舒亰于舒仆亳��亠 亰舒亞仍舒于从亳 ��舒����亳"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "��于��仂仄舒��亳��仆舒 仗��仂于亠��从舒 仆舒 仗仂亟仗亳��亳��亠"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "��仂从舒亰于舒仆亠 于 仂��亟亠仍亠仆 仗��仂亰仂��亠�� 仆舒 ��亠亰��仍��舒��舒 仂�� 仗��仂于亠��从舒 仆舒 仗仂亟仗亳��舒"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "����亠仄亠仆仆仂 ��������舒仆�磦舒仆亠 仆舒 仗舒��仂仍舒��舒 于 仗舒仄亠����舒"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "��亠于舒仍亳亟仆仂 ��仍亠亟"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "仄亳仆����舒(亳)"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(丕����舒仆仂于�磦舒仆亠 仆舒 `0' ��亠 ��������舒仆�磦舒 仗舒��仂仍舒��舒\n"
 "仗��亠亰 ���磿舒��舒 ��亠��亳��)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "����亠��于舒��舒仆亠 仆舒 于��仂亟舒 仗��亳 于��于亠亢亟舒仆亠 仆舒 仗舒��仂仍舒"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "��仂从舒亰于舒仆亠 仆舒 仗��亠亟��仗��亠亢亟亠仆亳亠 仗��亳 ����舒����亳��舒仆亠, 舒从仂 GnuPG 仆亠 ��舒弍仂��亳"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "����于舒���礌亠 于亳仆舒亞亳 仆舒 ����仂弍��亠仆亳����舒 亳亰弍��舒仆亳 于 亳亰于舒亟从舒��舒"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "����于舒���礌亠 仆舒 仗����于仂��仂 仆亠仗��仂��亠��亠仆仂 ����仂弍��亠仆亳亠 仗��亳 于仍亳亰舒仆亠 于 仗舒仗从舒"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "��舒��从亳��舒仆亠 从舒��仂 仗��仂��亠��亠仆仂 ��舒仄仂 仆舒 ����仂弍��亠仆亳亠 仂��于仂��亠仆仂 于 仆仂于 仗��仂亰仂��亠��"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "��仍亳亰舒仆亠 于��于 于��仂亟����舒��舒 从����亳�� ��仍亠亟 仗仂仍����舒于舒仆亠 仆舒 仆仂于亳 ����仂弍��亠仆亳��"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "��亠亰舒弍舒于仆仂 亳亰仗��仍仆亠仆亳亠 仗��亳 仄亠����亠仆亠 亳仍亳 亳亰����亳于舒仆亠 仆舒 ����仂弍��亠仆亳��"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(弌��仂弍��亠仆亳����舒 ��亠 弍��亟舒�� 仄舒��从亳��舒仆亳 亟仂 亳亰仗��仍仆亠仆亳亠��仂\n"
 "舒从仂 ��仂于舒 亠 亳亰从仍�ﾑ�亠仆仂)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "��亳舒仍仂亞 仗��亳 仗仂仍����舒于舒仆亠"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "��仂从舒亰于舒仆亠 仆舒 亟亳舒仍仂亞 仗��亳 仗仂仍����舒于舒仆亠"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "��亳仆舒亞亳"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr "弌舒仄仂 仗��亳 ������仆仂 仗仂仍����舒于舒仆亠"
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "��亳从仂亞舒"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "��亠亰 仗仂于亟亳亞舒仆亠 仆舒 亟亳舒仍仂亞 亰舒 亞��亠��从舒 仗��亳 亞��亠��从舒 仗��亳 仗仂仍����舒于舒仆亠"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "��舒��于舒���礌亠 仆舒 亟亳舒仍仂亞舒 仗��亳 仗仂仍����舒于舒仆亠 从仂亞舒��仂 亰舒于������亳"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr "��仗��亠亟亠仍�礌亠 仆舒 从仍舒于亳��仆亳 从仂仄弍亳仆舒��亳亳"
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "����仆��仆亳 从仂仄舒仆亟亳 (%s ��亠 弍��亟亠 亰舒仄亠仆亠仆 �� 亳仄亠 仆舒 ��舒亶仍 / URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "丕亠弍 弍��舒��亰����"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "��仂弍舒于�礌亠 仆舒 舒亟��亠��舒 于 仆舒亰仆舒��亠仆亳亠��仂 仗��亳 亟于仂亶仆仂 ����舒从于舒仆亠"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "����亳 亳亰仍亳亰舒仆亠"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "��仂��于����亢亟亠仆亳亠 仗��亳 亳亰仍亳亰舒仆亠"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "��亰��亳����于舒仆亠 仆舒 ��仂����亠��仂 仆舒 亳亰仍亳亰舒仆亠"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "��亳��舒仆亠 仗��亠亟亳 亳亰��亳����于舒仆亠"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "����亠亟��仗��亠亢亟亠仆亳亠 舒从仂 亳仄舒 ����仂弍��亠仆亳�� 于 仂仗舒��从舒��舒"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "����仂����仂��从舒 仆舒 ��/�� 仗仂����:"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "��亠从��仆亟舒(亳)"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "仆舒仗��仍仆仂 ����从��舒��亠仆仂��仂 亳仄亠 仆舒 亟亠仍仆亳从舒"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "仗��仍仆仂��仂 亳仄亠 仆舒 亟亠仍仆亳从舒"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "����从��舒��亠仆仂��仂 亳仄亠 仆舒 仄亠��亠��舒"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "仗��仍仆仂��仂 亳仄亠 仆舒 仄亠��亠��舒"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "仗��亠亟仗仂��亳��舒仆舒��舒 亟舒��舒 亳 ��舒�� 亰舒 ��亠从����亳�� 仍仂从舒仍"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "于亠从 (亞仂亟亳仆a/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "亟亠仆���� 仂�� 仄亠��亠��舒 从舒��仂 亟亠��亠��亳��仆仂 ��亳��仍仂"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "��舒��舒 从舒��仂 亟亠��亠��亳��仆仂 ��亳��仍仂 仗仂仍亰于舒亶从亳 24-��舒��仂于 ��舒��仂于仆亳从"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "��舒��舒 从舒��仂 亟亠��亠��亳��仆仂 ��亳��仍仂 仗仂仍亰于舒亶从亳 12-��舒��仂于 ��舒��仂于仆亳从"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "亟亠仆�� 仂�� 亞仂亟亳仆舒��舒 从舒��仂 亟亠��亠��亳��仆仂 ��亳��仍仂"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "仄亠��亠��舒 从舒��仂 亟亠��亠��亳��仆仂 ��亳��仍仂"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "仄亳仆����舒��舒 从舒��仂 亟亠��亠��亳��仆仂 ��亳��仍仂"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "亳仍亳 AM 亳仍亳 PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "��亠从��仆亟舒��舒 从舒��仂 亟亠��亠��亳��仆仂 ��亳��仍仂"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "亟亠仆�� 仂�� ��亠亟仄亳��舒��舒 从舒��仂 亟亠��亠��亳��仆仂 ��亳��仍仂"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "仗��亠亟仗仂��亳��舒仆舒��舒 亟舒��舒 亰舒 ��亠从����亳�� 仍仂从舒仍"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "仗仂��仍亠亟仆亳��亠 亟于亠 ��亳����亳 仂�� 亞仂亟亳仆舒��舒"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "亞仂亟亳仆舒��舒 从舒��仂 亟亠��亠��亳��仆仂 ��亳��仍仂"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "于��亠仄亠于舒��舒 亰仂仆舒 亳仍亳 亳仄亠 亳仍亳 ����从��舒��亠仆亳亠"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "��亟亠仆��亳��亳从舒��仂��"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "��仗亳��舒仆亳亠"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "����亳仄亠��"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "��仗��亠亟亠仍�礌亠 仆舒 ��于亠��仂于亠 仆舒 ����仂弍��亠仆亳亠��仂"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "丶于亠��仂于亠"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "丶亳��亳��舒仆 丐亠从���� - ������于仂 ��亳于仂"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "丶亳��亳��舒仆 丐亠从���� - ����仂��仂 ��亳于仂"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "丶亳��亳��舒仆 丐亠从���� - 丐��亠��仂 ��亳于仂"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI 于����亰从舒"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "����亠亳亰仗仂仍亰于舒仆亠 仆舒 ��于亠��仂于亠��亠 亰舒 ��亳��舒��"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "��亰弍亠��亠��亠 ��于���� 亰舒 ��亳��舒�� 仗����于仂 仆亳于仂"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "��亰弍亠��亠��亠 ��于���� 亰舒 ��亳��舒�� 于��仂��仂 仆亳于仂"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "��亰弍亠��亠��亠 ��于���� 亰舒 ��亳��舒�� ����亠��仂 仆亳于仂"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "��亰弍亠��亠��亠 ��于���� 亰舒 URL"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "��仗亳��舒仆亳亠 仆舒 ��亳仄于仂仍亳��亠"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4950,11 +4963,11 @@ msgstr ""
 "��仂于亳仆舒����从亳 亞����仗亳\n"
 "Message-ID"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "��从仂 x 亠 ������舒仆仂于亠仆, 仗仂从舒亰于舒 expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4968,7 +4981,7 @@ msgstr ""
 "丶亳��亳��舒仆仂 ���磿仂 仆舒 ����仂弍��亠仆亳亠 弍亠亰 仗仂亟仗亳��\n"
 "弌亳仄于仂仍 %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4980,15 +4993,15 @@ msgstr ""
 "弌亳仄于仂仍 仂��于舒������舒 从��亟��舒于舒 ��从仂弍舒\n"
 "弌亳仄于仂仍 亰舒��于舒������舒 从��亟��舒于舒 ��从仂弍舒"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "��亰弍仂�� 仆舒 ����亳����"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "��仍舒于亳��仆亳 从仂仄弍亳仆舒��亳亳"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4998,11 +5011,11 @@ msgstr ""
 "��仂亢亠��亠 ������仂 亟舒 仗��仂仄亠仆����亠 仗��亠仗��舒��从亳��亠 仆舒 于���磻仂 仄亠仆�� 从舒��仂 仆舒��亳��仆亠��亠\n"
 "从仂亶 亟舒 亠 从仍舒于亳��(亳) 仗��亳 仗仂����舒于�礌亠 仆舒 仗仂从舒亰舒仍亠��舒 仆舒 仄亳��从舒��舒 于�������� ������."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "��仂 仗仂亟��舒亰弍亳��舒仆亠"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "弌��舒�� Sylpheed"
 
@@ -5070,213 +5083,208 @@ msgstr "丕����舒仆仂于�磦舒仆亠 仆舒 ��亳仍������"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "��亠仍舒亠��亠 仍亳 亟舒 亳亰����亳亠��亠 仗��舒于亳仍仂��仂?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "��亠仂亰舒亞仍舒于亠仆"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "��亰����亳于舒仆亠 仆舒 仗��舒于亳仍仂"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "��亰����亳于舒仆亠 仆舒 仗��舒于亳仍仂"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "弌从��亳��亳 亰舒亞仍舒于仆亳 ��舒����亳"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "��舒亞仍舒于仆舒 ��舒����"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "弌��仂弍��亠仆亳亠"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "����亟����亢舒"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "仆亠 ����亟����亢舒"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "��亠����亠仆亠 仆舒亟仂仍��"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/_��仂仗亳��舒仆亠..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "��亠 ��亠 仗仂仍����舒于舒"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "��亰����亳于舒仆亠 仆舒 仗舒仗从舒"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "��舒弍亠仍亠亢从亳"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "��仗��亠亟亠仍�礌亠 仆舒 ��于亠��仂于亠 仆舒 ����仂弍��亠仆亳亠��仂"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_��舒��从亳��舒仆亠/��舒��从亳��舒仆亠 从舒��仂 _仗��仂��亠��亠仆仂"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/����_亠仗��舒��舒仆亠 从舒��仂 仗��亳������从舒"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/��_��亠仆舒��仂��于舒仆亠"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "��亰仗��仍仆�磦舒仆亠"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "��舒仗从舒"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "��亟��亠��"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "��舒亞仍舒于仆舒 ��舒����"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "��舒亞仍舒于仆舒 ��舒����"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "��舒亞仍舒于仆舒 ��舒����"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "��亠 亠 ��从舒亰舒仆 仗仂仍����舒��亠仍"
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "��亠 亠 于��于亠亟亠仆 从仂仄舒仆亟亠仆 ��亠亟."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "��亠 亠 ��从舒亰舒仆仂 仆舒亰仆舒��亠仆亳亠."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "��亠 亠 于��于亠亟亠仆 从仂仄舒仆亟亠仆 ��亠亟."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: ��舒亶仍���� 仆亠 ������亠����于��于舒\n"
@@ -5533,56 +5541,56 @@ msgstr "弌于����亰于舒仆亠"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "弌于����亰于舒仆亠 �� SMTP ������于����: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "��亰仗��舒��舒仆亠 仆舒 HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "丕亟仂����仂于亠���磦舒仆亠"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "��亰仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳亠..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "��亰仗��舒��舒仆亠 仆舒 EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "��亰仗��舒��舒仆亠 仆舒 MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "��亰仗��舒��舒仆亠"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "��亰仗��舒��舒仆亠 仆舒 RCPT ����..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "��亰仗��舒��舒仆亠 仆舒 DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "����亠从����于舒仆亠..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "��亰仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳亠 (%d / %d 弍舒亶��舒)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "��亰仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳亠"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "��仂�磦亳 ��亠 亞��亠��从舒 亳亰仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳亠��仂."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5889,120 +5897,120 @@ msgstr "No."
 msgid "Creating summary view...\n"
 msgstr "弌��亰亟舒于舒仆亠 仆舒 亳亰亞仍亠亟 仆舒 亳亰于舒亟从舒��舒...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "��弍��舒弍仂��于舒仆亠 仆舒 仄舒��从亠��"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "��仄舒 仂����舒仆舒仍亳 仄舒��从亠��亳. ��亠仍舒亠��亠 仍亳 亟舒 ��亠 仂弍��舒弍仂������?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "弌从舒仆亳��舒仆亠 仆舒 仗舒仗从舒 (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "���礆舒 仗仂于亠��亠 仆亠仗��仂��亠��亠仆亳 ����仂弍��亠仆亳��"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "��亠 亠 仆舒仄亠��亠仆仂 仆亠仗��仂��亠��亠仆仂 ����仂弍��亠仆亳亠. 丐������亠仆亠 仂�� 从��舒��?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "���礆舒 仆亠仗��仂��亠��亠仆亳 ����仂弍��亠仆亳��."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "��亠 亠 仆舒仄亠��亠仆仂 仆亠仗��仂��亠��亠仆仂 ����仂弍��亠仆亳亠. 丐������亠仆亠 于 ��仍亠亟于舒��舒��舒 仗舒仗从舒?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "丐������亠仆亠 仂��仆仂于仂"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "���礆舒 仗仂于亠��亠 仆仂于亳 ����仂弍��亠仆亳��"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "��亠 亠 仆舒仄亠��亠仆仂 仆仂于仂 ����仂弍��亠仆亳亠. 丐������亠仆亠 仂�� 从��舒��?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "���礆舒 仆仂于亳 ����仂弍��亠仆亳��."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "��亠 亠 仆舒仄亠��亠仆仂 仆仂于仂 ����仂弍��亠仆亳亠. 丐������亠仆亠 于 ��仍亠亟于舒��舒��舒 仗舒仗从舒?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "���礆舒 仗仂于亠��亠 仄舒��从亳��舒仆亳 ����仂弍��亠仆亳��"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "��亠 亠 仆舒仄亠��亠仆仂 仄舒��从亳��舒仆仂 ����仂弍��亠仆亳亠. 丐������亠仆亠 仂�� 从��舒��?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "���礆舒 仄舒��从亳��舒仆亳 ����仂弍��亠仆亳��."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "��亠 亠 仆舒仄亠��亠仆仂 仄舒��从亳��舒仆仂 ����仂弍��亠仆亳亠. 丐������亠仆亠 仂�� 仆舒��舒仍仂��仂?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "���礆舒 仗仂于亠��亠 ����仂弍��亠仆亳�� �� 亠��亳从亠��"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "��亠 亠 仆舒仄亠��亠仆仂 ����仂弍��亠仆亳亠 �� 亠��亳从亠��. 丐������亠仆亠 仂�� 从��舒��?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "���礆舒 ����仂弍��亠仆亳�� �� 亠��亳从亠��"
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "��亠 亠 仆舒仄亠��亠仆仂 ����仂弍��亠仆亳亠 �� 亠��亳从亠��. 丐������亠仆亠 仂�� 仆舒��舒仍仂��仂?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "弌��弍亳��舒仆亠 仆舒 ����仂弍��亠仆亳�� 仗仂 ��亠仄舒..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d 亳亰����亳��亳"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 仗��亠仄亠����亠仆亳"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 从仂仗亳��舒仆亳"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr "亳亰弍��舒仆(亳)"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 仆仂于亳, %d 仆亠仗��仂��亠��亠仆亳, %d 仂弍��仂 (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 仆仂于亳, %d 仆亠仗��仂��亠��亠仆亳, %d 仂弍��仂"
@@ -6172,6 +6180,9 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "亰舒仗亳������ 于 %s ��亠 仗��仂于舒仍亳.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "����亰仂弍仆仂于�磦舒仆亠 仆舒 于��亳��从亳 亟����于亠��舒 仆舒 仗舒仗从亳..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_��亰亞仍亠亟/_��仂亟亳��舒仆亠/---"
 
diff --git a/po/cs.po b/po/cs.po
index 1c9d73ab..7097b749 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+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"
@@ -63,11 +63,11 @@ msgstr ""
 "programem, pokud ne, napi邸te na adresu Free Software Foundation, Inc., 59 "
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Na��鱈t叩m nastaven鱈 pro v邸echny 炭��ty...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -75,19 +75,19 @@ msgstr ""
 "Jsou st叩le otev��ena n��jak叩 okna s rozepsanou zpr叩vou.\n"
 "P��ed 炭pravou tohoto 炭��tu zav��ete pros鱈m v邸echna tato okna."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Otev鱈r叩m okno pro 炭pravu 炭��tu...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Vytv叩��鱈m okno pro 炭pravu 炭��tu...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "��pravy 炭��t哲"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -95,8 +95,8 @@ msgstr ""
 "Nov辿 zpr叩vy budou kontrolov叩ny v tomto po��ad鱈. Pokud m叩 b箪t 炭��et\n"
 "kontrolov叩n p��i volb�� 'St叩hnout v邸e, za邸krtn��te pol鱈��ko ve sloupci 'G'."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -104,60 +104,66 @@ msgstr ""
 msgid "Name"
 msgstr "Jm辿no"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "P��idat"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Upravit"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " Smazat "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Dol哲"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Nahoru"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " Nastavit 炭��et jako v箪choz鱈 "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Opravdu chcete tento 炭��et smazat?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Neozna��en箪"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Smazat 炭��et"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "Opravdu chcete tento 炭��et smazat?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Ano"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Ne"
 
@@ -226,7 +232,7 @@ msgstr " Odeslat "
 msgid "Abort"
 msgstr "P��eru邸it"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -237,11 +243,11 @@ msgstr ""
 "('%%h' bude nahrazeno argumentem)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "Skryt箪 argument u転ivatele pro akci"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -252,7 +258,7 @@ msgstr ""
 "('%%u' bude nahrazeno argumentem)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "Argument u転ivatele pro akci"
 
@@ -260,7 +266,7 @@ msgstr "Argument u転ivatele pro akci"
 msgid "Add Address to Book"
 msgstr "P��idat adresu do datab叩ze"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -346,8 +352,8 @@ msgstr "/_Adresa/U_pravit"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_N叩stroje"
 
@@ -355,13 +361,13 @@ msgstr "/_N叩stroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_N叩stroje/Importovat _LDIF soubor"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/N叩po_v��da"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/N叩po_v��da/_O aplikaci"
 
@@ -378,10 +384,10 @@ msgid "/New _Folder"
 msgstr "/Nov叩 s_lo転ka"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -400,17 +406,17 @@ msgstr "/_Smazat"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Datab叩ze adres"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Jm辿no:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -578,7 +584,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Slo転ka"
 
@@ -602,7 +608,7 @@ msgstr "Spole��n叩 adresa"
 msgid "Personal address"
 msgstr "Osobn鱈 adresa"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Pozn叩mka"
 
@@ -610,7 +616,7 @@ msgstr "Pozn叩mka"
 msgid "Warning"
 msgstr "Varov叩n鱈"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Chyba"
 
@@ -622,31 +628,31 @@ msgstr "Vytv叩��鱈m dialog pro varov叩n鱈...\n"
 msgid "Show this message next time"
 msgstr "Zobrazovat p��鱈邸t�� tuto zpr叩vu"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Oran転ov叩"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "��erven叩"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "R哲転ov叩"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Nebesk叩 mod��"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Modr叩"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Zelen叩"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Hn��d叩"
 
@@ -654,7 +660,7 @@ msgstr "Hn��d叩"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "貼叩dn叩"
 
@@ -666,8 +672,8 @@ msgstr "/_P��idat..."
 msgid "/_Remove"
 msgstr "/_Odstranit"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
@@ -832,8 +838,8 @@ msgstr "/Z_obrazit/_Odpov���� komu "
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/Z_obrazit/---"
 
@@ -860,7 +866,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -943,140 +949,145 @@ msgstr "/Z_obrazit/_Znakov叩 sada/Zjednodu邸en叩 ��鱈nsk叩 (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/Z_obrazit/_Znakov叩 sada/Zjednodu邸en叩 ��鱈nsk叩 (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Z_obrazit/_Znakov叩 sada/Tradi��n鱈 ��鱈nsk叩 (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Z_obrazit/_Znakov叩 sada/Tradi��n鱈 ��鱈nsk叩 (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Z_obrazit/_Znakov叩 sada/Korejsk叩 (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Z_obrazit/_Znakov叩 sada/Thajsk叩 (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Z_obrazit/_Znakov叩 sada/Thajsk叩 (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_N叩stroje/_Datab叩ze adres"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_N叩stroje/��a_blona"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_N叩stroje/_Akce"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_N叩stroje/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/��p_ravy/Upravit pomoc鱈 e_xtern鱈ho editoru"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_N叩stroje/_Akce"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Zpr叩va/Za邸i_frovat"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Nelze z鱈skat ��叩st textu\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Chyba v uvozovk叩ch."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Chyba form叩tu odpov��di/p��eposl叩n鱈."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nemohu zjistit d辿lku souboru %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je pr叩zdn箪."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "Nemohu na��鱈st %s."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Zpr叩va: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Nemohu z鱈skat ��叩st z mnoha��叩s泥ov辿 zpr叩vy."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [Upraveno]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Psan鱈 zpr叩vy%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Psan鱈 zpr叩vy%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Nen鱈 uveden p��鱈jemce."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "P��edm��t je pr叩zdn箪. P��esto m叩m zpr叩vu odeslat?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "Nelze na��鱈st seznam p��鱈jemc哲."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1084,26 +1095,26 @@ msgstr ""
 "Nen鱈 zad叩n 炭��et pro odes鱈l叩n鱈 mail哲.\n"
 "P��ed odesl叩n鱈m vyberte pros鱈m n��jak箪 炭��et."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Vyskytla se chyba p��i pos鱈l叩n鱈 zpr叩vy na %s ."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Zpr叩vu nelze ulo転it do odeslan辿 po邸ty."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nemohu naj鱈t 転叩dn箪 kl鱈�� asociovan箪 s aktu叩ln�� vybran箪m id kl鱈��e '%s'."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "nelze zm��nit m坦d souboru\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1113,140 +1124,140 @@ msgstr ""
 "%s na %s.\n"
 "P��esto poslat?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "nelze zapsat z叩hlav鱈\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "nelze smazat star辿 zpr叩vy\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "za��azuji zpr叩vu...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "nelze naj鱈t slo転ku s frontou zpr叩v\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "Zpr叩vu nelze za��adit\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vytv叩��鱈m ��鱈slo zpr叩vy: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Vytv叩��鱈m okno pro psan鱈...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "D辿lka"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Ode邸le zpr叩vu"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Poslat pozd��ji"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "Za��ad鱈 do v箪stupn鱈 fronty a ode邸le pozd��ji"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Ulo転鱈 koncept do slo転ky"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Vlo転it"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Vlo転鱈 soubor"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "P��鱈loha"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "P��ipoj鱈 soubor"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Vlo転鱈 podpis"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "��prava extern鱈m editorem"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Zarovn叩n鱈"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Zarovn叩n鱈 dlouh箪ch ��叩dk哲"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Neplatn箪 MIME typ."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je pr叩zdn箪."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "K坦dov叩n鱈"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "N叩zev souboru"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "��patn箪 p��鱈kaz v extern鱈m editoru: '%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1257,72 +1268,72 @@ msgstr ""
 "M叩m p��eru邸it proces?\n"
 "��鱈slo procesu: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "P��eru邸en proces ��鱈slo: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Do��asn箪 soubor: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Psan鱈: vstup z extern鱈ho procesu\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Nelze spustit extern鱈 editor\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Nelze zapisovat do souboru\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Nelze ��鱈st\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Zpr叩vu nelze za��adit."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Zru邸it zpr叩vu"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Obsah zpr叩vy se zm��nil. Chcete ji stornovat?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Stornovat"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "Ulo転it jako koncept"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete pou転鱈t 邸ablonu '%s' ?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "P��idat 邸ablonu"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Nahradit"
 
@@ -1484,12 +1495,12 @@ msgstr "Upravit slo転ku"
 msgid "Input the new name of folder:"
 msgstr "Zadejte n叩zev slo転ky:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Nov叩 slo転ka"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Zadejte n叩zev slo転ky:"
 
@@ -1658,163 +1669,159 @@ msgstr "Selh叩n鱈 p��i z叩pisu konfigurace do souboru\n"
 msgid "Select folder"
 msgstr "Vybrat slo転ku"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Doru��en叩 po邸ta"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Odeslan叩 po邸ta"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Fronta"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Ko邸"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "Nov叩 slo転ka"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "%c nem哲転e b箪t obsa転eno ve jm辿n�� slo転ky."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Slo転ka '%s' u転 existuje."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nemohu vytvo��it slo転ku '%s'."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/_Vytvo��it novou slo転ku..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/P��ej_menovat slo転ku..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/_Smazat slo転ku"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Vypr叩zdnit ko邸"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/_Zkontrolovat nov辿 zpr叩vy"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnovit strom slo転ek"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/Na_j鱈t zpr叩vy..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "貼叩dn辿 nep��e��ten辿 zpr叩vy."
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/P��i_hl叩sit diskusn鱈 skupinu..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/Smazat d_iskusn鱈 skupinu"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Vytv叩��鱈m n叩hled pro slo転ku...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Nov叩"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Nep��e��ten辿"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Nastavuji informace o slo転ce...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o slo転ce..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohled叩v叩m slo転ku %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohled叩v叩m slo転ku %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom slo転ek"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Prov叩d鱈m obnovu stromu slo転ek..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Prov叩d鱈m obnovu stromu slo転ek..."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Prov叩d鱈m obnovu stromu slo転ek..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Zji邸泥uji nov辿 zpr叩vy ve v邸ech slo転k叩ch..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Je vybr叩na slo転ka %s\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pos鱈l叩m zpr叩vu"
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Vyskytla se chyba p��i pos鱈l叩n鱈 zpr叩vy na %s ."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1824,16 +1831,16 @@ msgstr ""
 "(Pokud chcete vytvo��it slo転ku, kter叩 bude m鱈t dal邸鱈\n"
 "podslo転ky, p��idejte nakonec n叩zvu '/')"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadejte nov辿 jm辿no pro '%s' :"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "P��ejmenovat slo転ku"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1842,24 +1849,24 @@ msgstr ""
 "V邸echny slo転ky a zpr叩vy v '%s' budou vymaz叩ny.\n"
 "Chcete je opravdu smazat ?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Smazat slo転ku "
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Nemohu odstranit slo転ku '%s'."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "Vypr叩zdnit ko邸"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "Vypr叩zdnit v邸echny zpr叩vy v ko邸i?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1868,34 +1875,34 @@ msgstr ""
 "Opravdu odebrat po邸tovn鱈 schr叩nku '%s'?\n"
 "(Zpr叩vy NEBUDOU smaz叩ny z disku)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Odstranit po邸tovn鱈 schr叩nku"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Opravdu smazat IMAP4 炭��et '%s'?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Smazat IMAP4 炭��et"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Opravdu chcete smazat diskusn鱈 skupinu '%s' ?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Smazat diskusn鱈 skupinu"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Opravdu smazat 炭��et pro diskusn鱈 skupinu '%s'?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Smazat 炭��et pro diskuzn鱈 skupinu"
 
@@ -1943,7 +1950,7 @@ msgstr "nezn叩m箪"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nemohu na��鱈st seznam diskuzn鱈ch skupin."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Hotovo."
 
@@ -2230,7 +2237,7 @@ msgstr "Importovat LDIF soubor do datab叩ze adres"
 msgid "Prev"
 msgstr "P��edchoz鱈"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "Dal邸鱈"
 
@@ -2321,7 +2328,7 @@ msgstr "P��ipojuji se na POP3 server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nemohu se spojit s POP3 serverem: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
@@ -2351,7 +2358,7 @@ msgstr "Zji邸泥uji po��et zpr叩v (LIST)..."
 msgid "Deleting message %d"
 msgstr "Vymaz叩v叩m zpr叩vu %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Ukon��uji"
 
@@ -2395,7 +2402,8 @@ msgstr "Nemohu zapisovat do souboru."
 msgid "Socket error."
 msgstr "Chyba soketu."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2412,11 +2420,11 @@ msgstr ""
 "Po邸tovn鱈 schr叩nka je zam��ena:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "Autentikace selhala."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2425,7 +2433,7 @@ msgstr ""
 "Autentikace selhala:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 #, fuzzy
 msgid "Session timed out."
 msgstr "vypr邸el ��as relace\n"
@@ -2848,329 +2856,329 @@ msgstr "/Z_obrazit/_Znakov叩 sada/Japonsk叩 (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Z_obrazit/_Znakov叩 sada/Japonsk叩 (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Z_obrazit/_Znakov叩 sada/��鱈nsk叩 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Z_obrazit/_Znakov叩 sada/Korejsk叩 (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/Z_obrazit/Otev��鱈t v _nov辿m okn��"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/Z_obrazit/Zd_roj zpr叩vy"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/Z_obrazit/Zobrazit v邸echna z叩_hlav鱈"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/Z_obrazit/_Aktualizace souhrnu"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_Zpr叩va"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Zpr叩va/Znov_u editovat"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Zpr叩va/P��ijmout _ze v邸ech 炭��t哲"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Zpr叩va/P��ijmout _ze v邸ech 炭��t哲"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Zpr叩va/P��eru邸it p��鱈_jem zpr叩v"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Zpr叩va/Znov_u editovat"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/_Zpr叩va/Odeslat pozd_r転en辿 zpr叩vy"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_Zpr叩va/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_Zpr叩va/_Nov叩 zpr叩va"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_Zpr叩va/_Odpov��d��t"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/_Zpr叩va/Odpo_v��d��t komu"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Zpr叩va/Odpo_v��d��t komu/_v邸em"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Zpr叩va/Odpo_v��d��t komu/_odes鱈lateli"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Zpr叩va/Odpo_v��d��t komu/do _diskusn鱈ho listu"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/_Zpr叩va/P��edat d叩_l"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Zpr叩va/P��eposlat _jako p��鱈lohu"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/_Zpr叩va/P��esm��rov_at"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_Zpr叩va/P��e_sunout..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/_Zpr叩va/_Kop鱈rovat..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_Zpr叩va/S_mazat"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_Zpr叩va/Ozna��_it"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Zpr叩va/Ozna��_it/_Ozna��it"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Zpr叩va/Ozna��_it/_Zru邸it ozna��en鱈"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_Zpr叩va/Ozna��_it/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Zpr叩va/Ozna��_it/Ozna��it jako _nep��e��ten辿"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Zpr叩va/Ozna��_it/Ozna��it jako _p��e��tenou"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Zpr叩va/Ozna��_it/Ozna��it _v邸echny jako p��e��ten辿"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/_Zpr叩va/Znov_u editovat"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_N叩stroje/P��idat odes鱈latele do a_dres叩��e"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_N叩stroje/_Filtr zpr叩v "
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_N叩stroje/_Filtr zpr叩v "
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_N叩stroje/_Vytvo��en鱈 filtru"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_N叩stroje/_Vytvo��en鱈 filtru/_Automaticky"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_N叩stroje/_Vytvo��en鱈 filtru/podle _Od"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_N叩stroje/_Vytvo��en鱈 filtru/podle _Komu"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_N叩stroje/_Vytvo��en鱈 filtru/podle _P��edm��tu"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_N叩stroje/_Smazat duplikovan辿 zpr叩vy"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_N叩stroje/S_pustit"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/_N叩stroje/Okno _z叩znam哲 "
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/Nastav_en鱈"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_en鱈/_Spole��n叩 nastaven鱈..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_en鱈/Nastaven鱈 _filtr哲..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_en鱈/��a_blona..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_en鱈/_Akce..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/Nastav_en鱈/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_en鱈/Nas_taven鱈 aktu叩ln鱈ho 炭��tu..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_en鱈/Zalo転it _nov箪 炭��et..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_en鱈/��_pravy 炭��t哲..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_en鱈/_Zm��na aktu叩ln鱈ho 炭��tu"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/N叩po_v��da/_Manu叩l"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/N叩po_v��da/_Manu叩l/_Anglicky"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/N叩po_v��da/_Manu叩l/_Japonsky"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/N叩po_v��da/_FAQ"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/N叩po_v��da/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/N叩po_v��da/_FAQ/_N��mecky"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/N叩po_v��da/_FAQ/��_pan��lsky"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/N叩po_v��da/_FAQ/_Francouzsky"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/N叩po_v��da/_FAQ/_Italsky"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/N叩po_v��da/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Vytv叩��鱈m hlavn鱈 okno...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavn鱈 okno: barevn辿 rozvr転en鱈 %d bylo ne炭sp��邸n辿\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Neozna��en箪"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "転叩dn箪"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "M��n鱈m typ odd��lova��e oken z %d na %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vypr叩zdnit ko邸"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Vypr叩zdnit v邸echny zpr叩vy v ko邸i?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "P��idat po邸tovn鱈 schr叩nku"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3180,16 +3188,16 @@ msgstr ""
 "Pokud je zad叩n existuj鱈c鱈, bude automaticky\n"
 "prohled叩n."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Po邸tovn鱈 schr叩nka '%s' ji転 existuje."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Po邸tovn鱈 schr叩nka"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3199,144 +3207,144 @@ msgstr ""
 "M哲転e to b箪t t鱈m, 転e schr叩nka ji転 existuje, nebo nem叩te dostate��n叩 pr叩va\n"
 "pro z叩pis."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazen鱈 slo転ky"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazen鱈 zpr叩vy"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Odpov��d��t"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpov鱈d叩 v邸em"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odpov��d��t _komu/_odes鱈lateli"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odpov��d��t _komu/do _diskusn鱈ho listu"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/P��_edat d叩l"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/P��eposlat _jako p��鱈lohu"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/P��es_m��rovat"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "St叩hnout"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Za��lenit novou po邸tu"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "St叩hnout v邸e"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "Za��len鱈 novou po邸tu ze v邸ech 炭��t哲"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Ode邸le pozdr転enou zpr叩vu(y)"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Vytv叩��鱈 novou zpr叩vu"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Odpov��d��t"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Odpov鱈d叩 na zpr叩vu"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "Odpov. v邸em"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Odpov鱈d叩 v邸em"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Poslat d叩l"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "P��ed叩v叩 zpr叩vu d叩l"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Smazat zpr叩vu"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Prov辿st"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Prov辿st ozna��en箪 proces "
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "Dal邸鱈 nep��e��tenou zpr叩vu"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Nastaven鱈"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "Spole��n叩 nastaven鱈"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "����et"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Nastaven鱈 炭��tu"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Ukon��en鱈 programu"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Chcete ukon��it tento program?"
 
@@ -3456,28 +3464,28 @@ msgstr "Dosa転en konec zpr叩vy, pokra��ovat od za��叩tku?"
 msgid "Search finished"
 msgstr "Hled叩n鱈 ukon��eno"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Vyvol叩v叩m zobrazen鱈 zpr叩vy...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "P��鱈lohy"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemohu ulo転it soubor '%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Tisk"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3486,7 +3494,7 @@ msgstr ""
 "Vlo転te p��鱈kazovou ��叩dku pro tisk:\n"
 "('%s' bude nahrazeno jm辿nem souboru)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3928,7 +3936,7 @@ msgstr "P��ijmout v邸echny zpr叩vy ze serveru"
 msgid "Receive size limit"
 msgstr "Limit velikosti pro p��鱈jem"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "KB"
 
@@ -3948,7 +3956,7 @@ msgstr "(Nefiltrovan辿 zpr叩vy budou ulo転eny v t辿to slo転ce)"
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Automaticky"
 
@@ -3972,7 +3980,7 @@ msgstr "Generovat ��鱈slo zpr叩vy"
 msgid "Add user-defined header"
 msgstr "P��idat u転ivatelsky definovan辿 z叩hlav鱈"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Upravit..."
 
@@ -4445,30 +4453,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodu邸en叩 ��鱈nsk叩 (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Zjednodu邸en叩 ��鱈nsk叩 (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradi��n鱈 ��鱈nsk叩 (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradi��n鱈 ��鱈nsk叩 (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "��鱈nsk叩 (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Korejsk叩 (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Thajsk叩 (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Thajsk叩 (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4477,11 +4490,11 @@ msgstr ""
 "Pokud je zvoleno 'Automatick叩', bude pou転ita\n"
 "znakov叩 sada podle locale."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "K坦dov叩n鱈 p��enosu"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4490,118 +4503,118 @@ msgstr ""
 "Ur��uje jak v jak辿 znakov辿 sad�� bude zpr叩va\n"
 "posl叩na kdy転 obsahuje ne-ASCII znaky."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Odd��lova�� podpisu"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Automaticky vlo転it"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustit extern鱈 editor"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "��rove�� zp��tn箪ch krok哲"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Zarovnat zpr叩vu na"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "znak哲"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Zalomit citaci"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Zalomit p��i p��ijmut鱈"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Zalomit p��ed odesl叩n鱈m"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "Automaticky vybrat 炭��et pro odpov��di"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Citovat zpr叩vy p��i odpov鱈d叩n鱈"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "Tla��鱈tko s odpov��d鱈 zvol鱈 odpov���� do diskusn鱈ho listu"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Form叩t odpov��di"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Zna��ka pro citaci"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Form叩t p��eposl叩n鱈"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Popis symbol哲 "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "P鱈smo"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "P��ekl叩dat n叩zvy z叩hlav鱈 (jako nap��鱈klad 'Od:', 'P��edm��t:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Zobrazit po��et nep��e��ten箪ch za n叩zvem slo転ky"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "Zkr叩tit n叩zvy diskuzn鱈ch skupin del邸鱈 ne転"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "dopisy(哲)"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Souhrnn箪 pohled"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Zobrazit p��鱈jemce ve sloupci 'Od', jestli転e odes鱈latel jste vy s叩m"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Rozbalit vl叩kna"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Form叩t datumu"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " Nastaven鱈 zobrazen箪ch polo転ek v souhrnu... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Povolit zabarven鱈 zpr叩v"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4609,328 +4622,328 @@ msgstr ""
 "Zobrazit v鱈ce-bytovou abecedu a ��鱈slice\n"
 "jako ASCII znaky (pouze pro Japonsko)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Zobrazit okno se z叩hlav鱈m nad zpr叩vou"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Zobrazit kr叩tk辿 z叩hlav鱈 p��i zobrazen鱈 zpr叩vy"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Pr叩zdn叩 ��叩dka"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "pixel(y)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Posun"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Polovina str叩nky"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Jemn箪 posun"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Krok"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Zm��nit velikost p��ipojen箪ch obr叩zk哲"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Zobrazit nastaven鱈 z叩hlav鱈"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Automaticky zkontrolovat podpis"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Zobrazit v箪sledek testov叩n鱈 podpisu v popup okn��"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Ulo転it passphrase do��asn�� v pam��ti"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Vypr邸鱈 za"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "minut(y) "
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Nastaven鱈 na '0' ulo転鱈 passphrase\n"
 " pro celou relaci)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr ""
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Zobrazit varov叩n鱈 pokud GnuPG nefunguje"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "Vybran辿 zpr叩vy v転dy otv鱈rat v p��ehledu"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "P��i vstupu do slo転ky otev��鱈t prvn鱈 nep��e��tenou zpr叩vu"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "Ozna��it zpr叩vu za p��e��t��nou pouze p��i otev��en鱈 v nov辿m okn��"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "Po p��ijet鱈 nov箪ch zpr叩v p��ej鱈t na Doru��enou po邸tu"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Vykonat ihned p��i p��esunu nebo maz叩n鱈 zpr叩v"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Pokud je tato volba vypnuta,\n"
 "zpr叩vy budou ozna��eny a転 do vykon叩n鱈)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Dialog o p��ijet鱈"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Zobrazit dialog o p��ijet鱈"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "V転dy"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "P��i p��鱈jmu chyby nezobrazovat popup dialog"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Zav��鱈t dialog o p��ijet鱈 po dokon��en鱈"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " Nastavit kl叩vesov辿 zkratky... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Extern鱈 p��鱈kaz (%s bude nahrazen jm辿nem souboru / URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Webov箪 prohl鱈転e��"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "P��idat adresu do c鱈le dvojklikem"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "P��i ukon��en鱈"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Potvrdit ukon��en鱈"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "P��i ukon��en鱈 vypr叩zdnit ko邸"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Potvrdit vypr叩zdn��n鱈"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Varovat pokud jsou zpr叩vy ve front��"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "��as vypr邸en鱈 pro I/O:"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "sekund(a)"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "zkratky pro n叩zvy dn哲 v t箪dnu"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "pln箪 n叩zev dne v t箪dnu"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "zkratka pro m��s鱈c"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "pln箪 n叩zev m��s鱈ce"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "preferovan辿 datum a ��as podle aktu叩ln鱈ho locale"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "stolet鱈 (rok/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "den v m��s鱈ci ��鱈seln��"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "hodiny ��鱈seln�� s 24 hodinov箪ch cyklem"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "hodiny ��鱈seln�� s 12 hodinov箪ch cyklem"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "rok ��鱈seln��"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "m��s鱈c ��鱈seln��"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "minuty ��鱈seln��"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "AM nebo PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "vte��iny ��鱈seln��"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "den v t箪dnu ��鱈seln��"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "preferovan箪 datum pro aktu叩ln鱈 locale"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "posledn鱈 dv�� ��鱈slice z roku"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "rok jako des鱈tkov辿 ��鱈slo"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "��asov叩 z坦na, n叩zev nebo zkratka"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Specifik叩tor"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Popis"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "P��鱈klad"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Nastaven鱈 barev pro zpr叩vy"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Citovan箪 text - Prvn鱈 炭rove��"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Citovan箪 text - Druh叩 炭rove��"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Citovan箪 text - T��et鱈 炭rove��"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Rotovat barvy citac鱈"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "Zvolte barvu pro 1 炭rove�� citace"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "Zvolte barvu pro 2 炭rove�� citace"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "Zvolte barvu pro 3 炭rove�� citace"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "Z鱈skat barvu z URI"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Popis symbol哲"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4954,11 +4967,11 @@ msgstr ""
 "Diskuzn鱈 skupina\n"
 "��鱈slo zpr叩vy"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4972,7 +4985,7 @@ msgstr ""
 "Citovan辿 t��lo zpr叩vy bez podpisu\n"
 "Znak %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4984,15 +4997,15 @@ msgstr ""
 "Znak lev叩 slo転en叩 z叩vorka\n"
 "Znak prav叩 slo転en叩 z叩vorka"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "V箪b��r p鱈sma"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Kl叩vesov辿 zkratky"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -5002,11 +5015,11 @@ msgstr ""
 "Kl叩vesovou zkratku pro nab鱈dku m哲転ete tak辿 zm��nit tak,\n"
 "転e p��i najet鱈 my邸鱈 na polo転ku stisknete odpov鱈daj鱈c鱈 kl叩vesu."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "V箪choz鱈"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Star箪 Sylpheed"
 
@@ -5074,214 +5087,209 @@ msgstr "Nastaven鱈 filtru"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Opravdu chcete smazat toto pravidlo?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Neozna��en箪"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Smazat pravidlo"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "Smazat pravidlo"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "V邸echna z叩hlav鱈"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "Z叩hlav鱈"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "Zpr叩va"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "obsahuje"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "neobsahuje"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "Posunout dol哲"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Kop鱈rovat..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Nedoru��it"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "Odebrat diskusn鱈 server"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "Pozn叩mky"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "Nastaven鱈 barev pro zpr叩vy"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Ozna��it/Ozna��it jako p��_e��ten辿"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/P��eposlat _jako p��鱈lohu"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/P��es_m��rovat"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "Prov辿st"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "Slo転ka"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "Adresa"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "Z叩hlav鱈"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "Z叩hlav鱈"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "Z叩hlav鱈"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Nen鱈 uveden p��鱈jemce."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Nen鱈 nastavena p��鱈kazov叩 ��叩dka."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "M鱈sto ur��en鱈 nen鱈 nastaven辿."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 #, fuzzy
 msgid "Invalid action exists."
 msgstr "Nespr叩vn箪 m��s鱈c\n"
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Nen鱈 nastavena p��鱈kazov叩 ��叩dka."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: soubor neexistuje\n"
@@ -5537,57 +5545,57 @@ msgstr "P��ipojen鱈"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "P��ipojuji se na SMTP server: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "Pos鱈l叩m HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "Autentizuji"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 #, fuzzy
 msgid "Sending message..."
 msgstr "Pos鱈l叩m zpr叩vu"
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "Pos鱈l叩m EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "Pos鱈l叩m MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "Odes鱈l叩n鱈"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "Pos鱈l叩m RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "Pos鱈l叩m DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Ukon��uji..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Pos鱈l叩m zpr叩vu (%d / %d byt哲)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "Pos鱈l叩m zpr叩vu"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "P��i pos鱈l叩n鱈 zpr叩vy nastala chyba."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5895,120 +5903,120 @@ msgstr "��鱈s."
 msgid "Creating summary view...\n"
 msgstr "Vytv叩��鱈m celkov箪 pohled...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Zpracovat ozna��en辿"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Zbyly n��jak辿 ozna��en辿. Zpracovat je?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prohled叩v叩m slo転ku (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Nejsou ji転 転叩dn辿 nep��e��ten辿 zpr叩vy"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Nebyla nalezena 転叩dn叩 nep��e��ten叩 zpr叩va. Hledat od konce?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "貼叩dn辿 nep��e��ten辿 zpr叩vy."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "Nebyla nalezena 転叩dn叩 nep��e��ten叩 zpr叩va. Chcete j鱈t do dal邸鱈 slo転ky?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "Hledat znova"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "Nejsou ji転 転叩dn辿 nov辿 zpr叩vy"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Nebyla nalezena 転叩dn叩 nov叩 zpr叩va. Hledat od konce?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "貼叩dn辿 nov辿 zpr叩vy."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "Nebyla nalezena 転叩dn叩 nov叩 zpr叩va. Chcete j鱈t do dal邸鱈 slo転ky?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Nejsou ji転 転叩dn辿 ozna��en辿 zpr叩vy"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "Nebyla nalezena 転叩dn叩 nep��e��ten叩 zpr叩va. Hledat od konce?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "貼叩dn叩 neozna��en叩 zpr叩va."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nebyla nalezena 転叩dn叩 neozna��en叩 zpr叩va. Hledat od za��叩tku?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Nejsou ji転 転叩dn辿 zpr叩vy s n叩v��邸t鱈m"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Nebyla nalezena 転叩dn叩 zpr叩va s n叩v��邸t鱈m. Hledat od konce?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "貼叩dn叩 zpr叩va s n叩v��邸t鱈m."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenalezena 転叩dn叩 zpr叩va s n叩v��邸t鱈m. Hledat od za��叩tku?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Z鱈sk叩v叩m zpr叩vy od osoby..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d smazan辿"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d p��em鱈st��n辿"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s %d zkop鱈rov叩no"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " polo転ky(ek) vybr叩ny"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nov叩(辿), %d nep��e��ten叩(辿), celkem %d (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nov箪ch, %d nep��e��ten箪ch, %d celkem"
@@ -6180,6 +6188,9 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "Ne炭sp��邸n箪 z叩pis do %s.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Prov叩d鱈m obnovu stromu slo転ek..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/Z_obrazit/_Znakov叩 sada/---"
 
diff --git a/po/da.po b/po/da.po
index cabb2918..2ac4b2db 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -62,11 +62,11 @@ msgstr ""
 "program.Hvis ikke, s奪 skriv til Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "L脱s konfiguration for hver konto...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -74,19 +74,19 @@ msgstr ""
 "Der er ny post vinduer 奪bent.\n"
 "Luk alle ny post vinduer inden rettelse af konti."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "��bn konto redig辿rings vindue...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Opret konto redig辿rings vindue...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Redig辿r konti"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -94,8 +94,8 @@ msgstr ""
 "Nye meddelelser bliver testet i denne r脱kkef淡lge. Afm脱rk\n"
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -103,60 +103,66 @@ msgstr ""
 msgid "Name"
 msgstr "Navn"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Tilf淡j"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Redig辿r"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " Slet "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Ned"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Op"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " Standard konto "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Vil du virkelig slette denne konto?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Uden titel"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Slet konto"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "Vil du virkelig slette denne konto?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Nej"
 
@@ -225,7 +231,7 @@ msgstr "Send "
 msgid "Abort"
 msgstr "Afbryd"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -236,11 +242,11 @@ msgstr ""
 "(`%%h' bliver erstattet af handlingen:)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "Handlngens skjulte parametre"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -251,7 +257,7 @@ msgstr ""
 "(`%%h' bliver erstattet af handlingen:)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "Handlingens bruger parameter"
 
@@ -259,7 +265,7 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilf淡j adresse i adressebog"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -345,8 +351,8 @@ msgstr "/_Adresse/_Redig辿r"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_Funktioner"
 
@@ -354,13 +360,13 @@ msgstr "/_Funktioner"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/_Hj脱lp"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/_Hj脱lp/_Om"
 
@@ -377,10 +383,10 @@ msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -399,17 +405,17 @@ msgstr "/_Slet"
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Navn:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -573,7 +579,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Mappe"
 
@@ -597,7 +603,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Note"
 
@@ -605,7 +611,7 @@ msgstr "Note"
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Fejl"
 
@@ -617,31 +623,31 @@ msgstr "Opretter alarm panel dialog...\n"
 msgid "Show this message next time"
 msgstr "Vis denne meddelelse igen"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Orange"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "R淡d"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Himmelbl奪"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Bl奪"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Gr淡n"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Brun"
 
@@ -649,7 +655,7 @@ msgstr "Brun"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Ingen"
 
@@ -661,8 +667,8 @@ msgstr "/_Tilf淡j..."
 msgid "/_Remove"
 msgstr "/_Fjern"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/_Egenskaber..."
 
@@ -827,8 +833,8 @@ msgstr "/_Vis/_Svar til"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_Vis/---"
 
@@ -855,7 +861,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -938,140 +944,145 @@ msgstr "/_Vis/_Tegns脱t/Simplified Chinese (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_Vis/_Tegns脱t/Simplified Chinese (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vis/_Tegns脱t/Traditional Chinese (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vis/_Tegns脱t/Traditional Chinese (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vis/_Tegns脱t/Korean (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vis/_Tegns脱t/Thai (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vis/_Tegns脱t/Thai (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_Funktioner/_Adressebog"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_Funktioner/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Redig辿r/Redig辿r med e_kstern editor"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Kan ikke l脱se tekst afsnit\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Citat mark辿rings format fejl."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke l脱se st淡rrelse p奪 %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke l脱se %s"
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [Redig辿ret]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Ny meddelelse%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Send"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "Kan ikke 奪bne modtager liste."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1079,26 +1090,26 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "V脱lg konto f淡r afsendelse er mulig."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Kunne ikke funde n淡gle til den valgte n淡gle id `%s'."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "kan ikke 脱ndre fil mode\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1108,140 +1119,140 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "kan ikke skrive hoved\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "meddelelse i k淡...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "kan ikke v脱lge mappe %s\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke l脱gges i k淡\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "St淡rrelse"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Send senere"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "L脱g i k淡 og send senere"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Kladde"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Gem i Kladde"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Ind脱st"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Ins脱t fil"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Vedh脱ft"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Vedh脱ft fil"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Underskrift"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Inds脱t underskrift"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Redig辿r med ekstern Editor"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Linie deling"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "/_Redig辿r/Formater _alle lange linier"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Tegns脱t kodning"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1252,72 +1263,72 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Afbrudt proces gruppe ID: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Midlertidig fil: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Instast: fra monitor process\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Kunne ikke starte ekstern editor\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Kunne ikke gemme fil\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Fejl i l脱sning fra Pipe\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke l脱gges i k淡."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "V脱lg fil"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "V脱lg fil"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Slet meddelelse"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Denne meddelelse er 脱ndret. Slet?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Slet"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "til Kladde"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Erstat"
 
@@ -1478,12 +1489,12 @@ msgstr "Redig辿r mappe"
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -1652,163 +1663,159 @@ msgstr "kunne ikke gemme konfiguration til fil\n"
 msgid "Select folder"
 msgstr "V脱lg mappe"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Sendt"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "K淡"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Slettet"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Kladde"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "NyMappe"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kan ikke benyttes i mappe navn."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen `%s' eksisterer allerede."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan ikke oprette mappe `%s'."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/_Opret ny mappe..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/_Omd淡b mappe..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/_Slet mappe"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "T淡m Slettet"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "_Hent nye meddelelser"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/G_endan mappe tr脱"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/_S淡g meddelelse..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "Ingen ul脱ste meddelelser."
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Abonner p奪 nyhedsgruppe..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/_Slet nyhedsgruppe"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Opretter mappe tr脱...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Ny"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Ul脱st"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Indtast mappe information...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennems淡ger mappe %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennems淡ger mappe %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "Genopbyg mappe tr脱"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Gendanner mappe tr脱..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Gendanner mappe tr脱..."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Gendanner alle mappe tr脱er..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Henter nye meddelelser i alle mapper..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappe %s er valgt\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1818,16 +1825,16 @@ msgstr ""
 "(hvis du vil oprette mappe til undermapper,,\n"
 "s奪 afslut navn med `/')"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nyt navn for `%s':"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Omd淡b mappe"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1836,24 +1843,24 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Slet mappe"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "T淡m Slettet"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1862,34 +1869,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
@@ -1937,7 +1944,7 @@ msgstr "ukendt"
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan ikke modtage gruppe liste."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Afsluttet."
 
@@ -2222,7 +2229,7 @@ msgstr "Importer LDIF fil til adressebog"
 msgid "Prev"
 msgstr "Forrige"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "N脱ste"
 
@@ -2313,7 +2320,7 @@ msgstr "Forbinder til POP3 server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Godkender..."
 
@@ -2343,7 +2350,7 @@ msgstr "Modtager antal nye meddelelser (LIST)..."
 msgid "Deleting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Afslutter"
 
@@ -2390,7 +2397,8 @@ msgstr "Kan ikke skrive til fil."
 msgid "Socket error."
 msgstr "Sokkel fejl."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2408,11 +2416,11 @@ msgstr ""
 "Mailbox er l奪st:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "Godkendelses fejlede."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2421,7 +2429,7 @@ msgstr ""
 "Godkendelsesfejl:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 #, fuzzy
 msgid "Session timed out."
 msgstr "tid udl淡bet\n"
@@ -2844,329 +2852,329 @@ msgstr "/_Vis/_Tegns脱t/Japanese (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vis//_Tegns脱t/Japanese (_Shift_JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vis/_Tegns脱t/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vis/_Tegns脱t/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Vis/��bn i nyt vindue"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_Vis/_Kilde"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_Vis/_Alle hoved linier"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_Vis/_Opdat辿r oversigt"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_Meddelelse"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelelse/Redig辿r _igen"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Meddelelse/_Afbryd afsendelse"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelelse/Redig辿r _igen"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelelse/Send meddelelser i _k淡"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_Meddelelse/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelelse/Opret _ny meddelelse"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_Meddelelse/_Besvar"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelelse/_Svar til"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelelse/_Svar til/A_lle"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelelse/_Svar til/Af_sender"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelelse/_Svar til/_Alle"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/_Meddelelse/_Videresend"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelelse/Videresend som _vedh脱ftet"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelelse/_Omdirig辿r"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelelse/_Flyt..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelelse/_Kopiere..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_Meddelelse/_Slet"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_Meddelelse/_Mark辿r"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelelse/_Mark辿r/_Mark辿r"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelelse/_Mark辿r/_Slet mark辿ring"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelelse/_Mark辿r/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelelse/_Mark辿r/Som ul脱st"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelelse/_Mark辿r/Som l脱st"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelelse/_Mark辿r/Alle som l脱st"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelelse/Redig辿r _igen"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Funktioner/Tilf淡j afsender til adressebog"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Funktioner/_Opret filter"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Funktioner/_Opret filter/_Automatisk"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Funktioner/_Opret filter/Efter _Fra"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Funktioner/_Opret filter/Efter _Til"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Funktioner/_Opret filter/Efter _Emne"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Meddelelse/Slet alle du_blikerede meddelelser"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_Funktioner/_Udf淡r"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/Funktioner/_Logbog vindue"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Ops脱t"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Ops脱t/Generelt _ops脱t..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Ops脱t/_Filter ops脱t..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_Ops脱t/_Skabelon..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_Ops脱t/_Handlinger..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Ops脱t/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Ops脱t/_Den aktuelle konto..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Ops脱t/_Opret ny konto..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Ops脱t/_Redig辿r konti..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Ops脱t/_Skift aktuel konto..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_Hj脱lp/_Vejledning"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/_Vejledning/_Engelsk"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/_Vejledning/_Japansk"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/_Hj脱lp/_OSS"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hj脱lp/_OSS/_Engelsk"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hj脱lp/_OSS/_Tysk"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hj脱lp/_OSS/_Spansk"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hj脱lp/_OSS/_Fransk"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hj脱lp/_OSS/_Italiensk"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_Hj脱lp/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Opretter hoved vindue...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "ingen"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "��ndre vindue adskillelse type fra %d til %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "T淡m Slettet"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Ny mailbox"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3176,16 +3184,16 @@ msgstr ""
 "Hvis den eksisterende mailbox angives, vil den blive\n"
 "gennems淡gt automatisk."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3194,144 +3202,144 @@ msgstr ""
 "Fejl i oprettelse af mailbox.\n"
 "M奪ske findes filerne allerede eller du har ikke skrive rettighedder."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappe visning"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Svar"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedh脱ftet"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/_Omdirig辿r"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Hent"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Hent ny post"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Hent alt"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "Hent ny post fra alle konti"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Sender meddelelse(r) i k淡"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Opret"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Opret ny meddelelse"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Besvar"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Besvar meddelelse"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "Besvar alle"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Videresend"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Videresend meddelelse"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Slet meddelelse"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Udf淡r"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Udf淡r mark辿ret process"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "N脱ste ul脱ste"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Ops脱t"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "Generelt ops脱t"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Konto indstillinger"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
@@ -3453,28 +3461,28 @@ msgstr "Slutnigen af meddelelse n奪et; forts脱t fra starten?"
 msgid "Search finished"
 msgstr "S淡gning afsluttet"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Opretter meddelelses vindue...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Vedh脱ftet"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Udskriv"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3483,7 +3491,7 @@ msgstr ""
 "Indtast udkrift kommando:\n"
 "(`%s' bliver erstattat af fil navn)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3927,7 +3935,7 @@ msgstr "Hent alle meddelelser fra server"
 msgid "Receive size limit"
 msgstr "Modtagelses st淡rrelse maks."
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "kB"
 
@@ -3947,7 +3955,7 @@ msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
 msgid "Authentication method"
 msgstr "Godkendelses metode"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -3971,7 +3979,7 @@ msgstr "Opret meddelelses ID"
 msgid "Add user-defined header"
 msgstr "Tilf淡j bruger defineret hoved"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Redig辿r... "
 
@@ -4442,30 +4450,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Simplified Chinese (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4474,11 +4487,11 @@ msgstr ""
 "Hvis `Automatisk' er valgt benyttes det optimale\n"
 "tegns脱t for den valgte locale."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "Kodning af overf淡rsel"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4487,118 +4500,118 @@ msgstr ""
 "Angiv Content-Transfer-Encoding anvendt hvis\n"
 "besked inholder andet end ASCII tegn."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Underskriftsdeling"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Tilf淡j automatisk"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Start automatisk ekstern editor"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "Fortryd niveauer"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Del linier ved"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "tegn"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Del citat linier"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Del ved indtastning"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Del linier f淡r afsendelse"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "V脱lg automatisk konto ved besvarelse"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Citat af meddelelse i svar"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "Svar knap starter svar til mail liste"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Svar format"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Citat tegn"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Videresend format"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Beskrivelse af symboler "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Skrifttype"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Overs脱t hoved navn (fx. `Fra:', `Emne:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Vis antal ul脱ste ved siden af mappe navn"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "Forkort nyhedsgruppe l脱ngere end"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "bogstaver"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Meddelelses visning"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Vis modtager i `Fra' hvis du er afsender"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "��bn tr奪de"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Dato format"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " V脱lg oplysninger i oversigt... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Benyt farver i meddelelser"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4606,326 +4619,326 @@ msgstr ""
 "Vis 2-byte alfabet og tal som ASCII\n"
 "tegn (kun japansk)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Vis hoved linier over meddelelses vindue"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Vis korte hoved linier i meddelelses vindue"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Linie afstand"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "punkter"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Scrol"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Halv side"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Bl淡d scroll"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Skrift"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "��ndre st淡rrelse p奪 vedh脱ftede billeder"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Hoved ops脱t"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Check signatur automatisk"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Vis signatur check resultat i separat vindue"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Gem  adgangss脱tning midlertidigt i hukommelsen"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Udl淡b efter"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "minut(er)"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(S脱t til '0' vil gemme adgangss脱tningen\n"
 " for hele sessionen)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Overtag indtastning mens adgangss脱tning indtastes"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Advarsel ved start hvis GnuPG ikke virker"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "��bn altid besked i oversigtsbilledet hvis valgt"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "��bn f淡rste ul脱ste meddelelse ved indgang til mappe"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "Mark辿r kun meddelelser som l脱st hvis 奪bnet i nyt vindue"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "G奪 til Indbakke efter modtagelse af ny post"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Udf淡r straks ved flyt eller slet af meddelelse(r)"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "(Ellers mark辿res meddelelese indtil der v脱lges 'Udf淡r')"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Vis modtag billede"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Vis modtag billede"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Altid"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "Vis ikke fejlmeddelelse ved fejl"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Luk modtag vindue efter overf淡rsel"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " V脱lg tast bindinger... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Ekstern editor (%s erstattes af filnavn / URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Web browser"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "Tilf淡j adresse til 'Til' ved dobbeltklik"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "Ved afslut"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Sp淡rg ved afslut"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "T淡m Slettet ved afslut"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Sp淡rg f淡r t淡mning"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Advar ved meddelelser i k淡"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O timeout:"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "sekund(er)"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "kort ugedags navn"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "Ugedags navn"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "kort m奪neds navn"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "m奪neds navn"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "淡nsket dato format for nuv脱rende locale"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "奪rhundrede (奪r/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "dag i m奪ned som tal"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "time som tal (24 timers visning)"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "time som tal (12 timers visning)"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "奪rhundrede som tal"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "m奪ned som tal"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "minut som tal"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "enten AM eller PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "sekund som tal"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "ugedag som tal"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "淡nsket dato format for nuv脱rende locale"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "de sidste to cifre i 奪ret"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "奪ret som tal"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "tidszone som navn eller forkortelse"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "V脱lger"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "Eksempel"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Angiv meddelelses farve"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Farve"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Citeret tekst - 1. niveau"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Citeret tekst - 2. niveau"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Citeret tekst - 3. nivaur"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI-Link"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Genbrug citat farver"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "V脱lg farve for nivau 1"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "V脱lg farve for nivau 2"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "V脱lg farve for nivau 3"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "V脱lg farve for URI"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Beskrivelse af symboler"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4949,11 +4962,11 @@ msgstr ""
 "Nyhedsgrupper\n"
 "Meddelelses ID"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Hvis x er valgt vises expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4967,7 +4980,7 @@ msgstr ""
 "Citeret meddelelses krop uden signatur\n"
 "%"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4979,15 +4992,15 @@ msgstr ""
 "{\n"
 "}"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Skrifttype"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Tast bindinger"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4997,11 +5010,11 @@ msgstr ""
 "Du kan ogs奪 脱ndre hver menus genvejstast ved at taste enhver ved at placere\n"
 "mus over menu punkt og taste en tast."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Gl. Sylpheed"
 
@@ -5069,213 +5082,208 @@ msgstr "Filter ops脱t"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Wollen Sie wirklich diese Regel Slet?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Uden titel"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Slet regel"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "Slet regel"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "Alle hoved linier"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "Hoved"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "Meddelelse"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "indholder"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "indholder ikke"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "Ned"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Kopier..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Modtag ikke"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "Slet mappe"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "Kommentar"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "Angiv meddelelses farve"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Mark辿r/_L脱st"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Videresend som _vedh脱ftet"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/_Omdirig辿r"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "Udf淡r"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "Mappe"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "Adresse"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "Hoved"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "Hoved"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "Hoved"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Mangler modtager"
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Kommando linie ikke opsat."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Destination ikke valgt."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Kommando linie ikke opsat."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: fil findes ikke\n"
@@ -5532,59 +5540,59 @@ msgstr "Forbinder"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Forbindelse med SMTP server: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "Sender HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "Godkender"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "Sende meddelelse..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "Sender EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "Sender MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "Sender"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "Sender RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "Sender DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Afslutter..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "Sende Meddelelse"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 #, fuzzy
 msgid "Error occurred while sending the message."
 msgstr ""
 "Fejl ved afsendelse meddelelse:\n"
 "%s"
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5891,120 +5899,120 @@ msgstr "Nr."
 msgid "Creating summary view...\n"
 msgstr "Opretter oversigt...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Bearbejder mark辿ring"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Nogle mark辿ringer er tilbage. Bearbejde dem?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "S淡ger mappe (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Ikke flere ul脱ste meddelelser"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Ingen ul脱ste meddelelser fundet. S淡g fra slutning?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "Ingen ul脱ste meddelelser."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "Ingen ul脱ste meddeleleser fundet. Forts脱t til n脱ste mappe?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "S淡g igen"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "Ikke flere nye meddelelser"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Ingen nye meddelelser fundet. S淡g fra slutning?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "Ingen nye meddelelser."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "Ingen nye meddeleleser fundet. Forts脱t til n脱ste mappe?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Ikke flere ul脱ste meddelelser"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "Ingen mark辿rede meddelelser fundet. S淡g bagfra?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "Ingen mark辿rede eddelelser."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "Ingen mark辿rede meddelelser fundet. S淡g forfra?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Ikke flere mark辿rede eddelelser"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Ingen mark辿rede meddelelser funder. S淡g bagfra?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "Ingen mark辿rede meddelelser."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Ingen mark辿rede meddelelser fundet. S淡g forfra?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Samler meddelelser via Emne..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d slettet"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttet"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopieret"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " valgte"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nye, %d ul脱st, %d total (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nye, %d ul脱ste, %d total"
@@ -6178,6 +6186,9 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "fejl ved skrivning til %s.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Gendanner alle mappe tr脱er..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_Vis/_Tegns脱t/---"
 
diff --git a/po/de.po b/po/de.po
index 0aaa89a6..689950f1 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: 2005-02-08 22:49+0100\n"
 "Last-Translator: Manfred Usselmann <usselmann.m@icg-online.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -66,11 +66,11 @@ msgstr ""
 "erhalten haben; wenn nicht, dann schreiben Sie an Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Lese alle Einstellungen f端r jeden Account...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -78,19 +78,19 @@ msgstr ""
 "Es sind einige Fenster zum Verfassen von Nachrichten ge旦ffnet.\n"
 "Bitte schlie��en Sie diese Fenster vor dem Beabeiten der Accounts."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "��ffne Accountbearbeitungsfenster...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Erstelle Accountbearbeitungsfenster...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Bearbeite Accounts"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -99,8 +99,8 @@ msgstr ""
 "Schalter\n"
 "in der `G'-Spalte, um den Nachrichten-Empfang bei `Hole alle' einzuschalten."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -108,60 +108,66 @@ msgstr ""
 msgid "Name"
 msgstr "Name"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Hinzuf端gen"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " L旦schen "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Ab"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Auf"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " Standardaccount "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Wollen Sie diesen Account wirklich l旦schen?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Unbenannt"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Account l旦schen"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "Wollen Sie diesen Account wirklich l旦schen?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Nein"
 
@@ -230,7 +236,7 @@ msgstr "Senden "
 msgid "Abort"
 msgstr "Abbrechen"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -241,11 +247,11 @@ msgstr ""
 "(`%%h' wird durch den Parameter ersetzt)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "Aktionen verstecken den Parameter"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -256,7 +262,7 @@ msgstr ""
 "(`%%u' wird durch den Parameter ersetzt)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "Aktionen Benutzer-Parameter"
 
@@ -264,7 +270,7 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einf端gen"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -350,8 +356,8 @@ msgstr "/_Adresse/_Bearbeiten"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_L旦schen"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_Werkzeug"
 
@@ -359,13 +365,13 @@ msgstr "/_Werkzeug"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_��ber"
 
@@ -382,10 +388,10 @@ msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -404,17 +410,17 @@ msgstr "/_L旦schen"
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Name:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -585,7 +591,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Ablage"
 
@@ -609,7 +615,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Pers旦nliche Adressen"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Notiz"
 
@@ -617,7 +623,7 @@ msgstr "Notiz"
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Fehler"
 
@@ -629,31 +635,31 @@ msgstr "Erstelle Alarmpanel-Dialog...\n"
 msgid "Show this message next time"
 msgstr "Zeige diese Nachricht das n辰chste mal an"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Orange"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "Rot"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Himmelblau"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Blau"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Gr端n"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Braun"
 
@@ -661,7 +667,7 @@ msgstr "Braun"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Keine"
 
@@ -673,8 +679,8 @@ msgstr "/_Hinzuf端gen..."
 msgid "/_Remove"
 msgstr "/_Entfernen"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
@@ -834,8 +840,8 @@ msgstr "/_Ansicht/A_ntwort an"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_Ansicht/---"
 
@@ -862,7 +868,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -945,137 +951,142 @@ msgstr "/_Ansicht/_Zeichensatz/Simplified Chinese (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_Ansicht/_Zeichensatz/Simplified Chinese (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/_Zeichensatz/Traditional Chinese (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/_Zeichensatz/Traditional Chinese (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/_Zeichensatz/Korean (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_Werkzeug/_Adressbuch"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_Werkzeug/_Schablone"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_Werkzeug/Aktio_nen"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_Werkzeug/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Werkzeug/Mit e_xternem Editor bearbeiten"
 
-#: src/compose.c:674
+#: src/compose.c:676
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Werkzeug/PGP _Unterschreiben"
 
-#: src/compose.c:675
+#: src/compose.c:677
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Werkzeug/PGP _Verschl端sseln"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Kann Textabschnitt nicht lesen\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigr旦��e von %s nicht ermitteln\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [in Bearbeitung]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Verfasse Nachricht%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Verfasse Nachricht%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Empf辰nger nicht angegeben"
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Senden"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "Kann die Empf辰ngerliste nicht holen."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1083,26 +1094,26 @@ msgstr ""
 "Account zum Versenden von E-Mails, wurde nicht angegeben.\n"
 "Bitte w辰hlen sie einen E-Mail-Account vor dem Senden."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Kein Schl端ssel f端r die aktuelle gew辰hlte Schl端ssel-ID vorhanden `%s'."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht 辰ndern\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1112,140 +1123,140 @@ msgstr ""
 "(von %s zu %s).\n"
 "Trotzdem senden?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "kann Kopfzeilen nicht schreiben\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Gr旦��e"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Sende Nachricht"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Sp辰ter senden"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "In Queue-Ablage und sp辰ter senden"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Entwurf"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Speichern in Entwurfablage"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Einf端gen"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Datei einf端gen"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Anh辰ngen"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Datei anh辰ngen"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Unterschrift"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Unterschrift einf端gen"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Bearbeiten mit externem Editor"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Zeilenumbruch"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Alle langen Zeilen umbrechen"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Ung端ltiger MIME Typ"
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Kommandozeile f端r den externen Editor ist ung端ltig: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1256,72 +1267,72 @@ msgstr ""
 "Prozess terminieren?\n"
 "Prozessgruppen ID: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Gruppen ID: %d des terminierten Prozesses"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Tempor辰re Datei: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Verfassen: Eingabe vom ��berwachungsprozess\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Kann externen Editor nicht ausf端hren\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Kann nicht in Datei schreiben\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Lesen von Pipe fehlgeschlagen\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "W辰hle Datei"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "W辰hle Datei"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Diese Nachricht wurde ge辰ndert. Verwerfen?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Verwerfen"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "zum Entwurf"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone `%s' 端bernehmen ?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Schablone 端bernehmen"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Ersetzen"
 
@@ -1482,12 +1493,12 @@ msgstr "Ablage bearbeiten"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -1656,160 +1667,156 @@ msgstr "konnte nicht in die Konfigurationsdatei schreiben\n"
 msgid "Select folder"
 msgstr "W辰hle Ablage"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Warteschlange"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Entw端rfe"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "NeueAblage"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kann nicht in den Ablagenamen integriert werden."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage `%s' existiert bereits."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage `%s' nicht erstellen."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/_Neue Ablage erstellen..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/Ablage _umbenennen..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/Ablage _l旦schen"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 msgid "/Empty _trash"
 msgstr "/Leere _Papierkorb"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/Auf neue Nachrichten pr端fen"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/A_blagebaum erneuern"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/_Suche Nachrichten..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 msgid "/Down_load"
 msgstr "/Herunterladen"
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Newsgroup _abonnieren..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/Newsgroup _entfernen"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Erstelle Ablageansicht...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Neu"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Setze Ablageinformation...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "Ablagebaum erneuern"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Der Ablagebaum wird erneuert. Weiter?"
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Ablagenbaum erneuern..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ablagenbaum erneuern fehlgeschlagen..."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Alle Ablagenb辰ume erneuern..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ablagen auf neue Nachrichten pr端fen..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ablage %s ist gew辰hlt\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Lade Nachrichten nach %s ..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in `%s' ."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1819,16 +1826,16 @@ msgstr ""
 "(wenn Sie eine Ablage zum Speichern von Unterablagen erstellen wollen,\n"
 "dann h辰ngen Sie ein `/' an das Ende des Namens)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name f端r `%s':"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1837,24 +1844,24 @@ msgstr ""
 "Alle Ablagen und Nachrichten in `%s' werden gel旦scht.\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Ablage l旦schen"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kann Ablage `%s' nicht entfernen."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "L旦sche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1863,34 +1870,34 @@ msgstr ""
 "Mailbox `%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gel旦scht)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account `%s' wirklich l旦schen?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account l旦schen"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup `%s' wirklich l旦schen?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Newsgroup l旦schen"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account `%s' wirklich l旦schen?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "News-Account l旦schen"
 
@@ -1938,7 +1945,7 @@ msgstr "unbekannt"
 msgid "Can't retrieve newsgroup list."
 msgstr "Kann die Newsgroup-Liste nicht empfangen."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Fertig."
 
@@ -2222,7 +2229,7 @@ msgstr "Importiere LDIF-Datei in Adressbuch"
 msgid "Prev"
 msgstr "Vorherige"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "N辰chste"
 
@@ -2312,7 +2319,7 @@ msgstr "Verbinde mit POP3-Server: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Beglaubigen..."
 
@@ -2342,7 +2349,7 @@ msgstr "Bekomme Anzahl der neuen Nachrichten (LIST)..."
 msgid "Deleting message %d"
 msgstr "L旦sche Nachricht %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Beenden"
 
@@ -2385,7 +2392,8 @@ msgstr "Kann Datei nicht schreiben."
 msgid "Socket error."
 msgstr "Socket-Fehler."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "Verbindung geschlossen vom Remote-Host."
 
@@ -2402,11 +2410,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "Beglaubigung fehlgeschlagen."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2415,7 +2423,7 @@ msgstr ""
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr "Sitzungszeit abgelaufen."
 
@@ -2829,320 +2837,320 @@ msgstr "/_Ansicht/_Zeichensatz/Japanese (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (_Shift_JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ansicht/_Zeichensatz/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ansicht/_Zeichensatz/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/��ffnen in _neuem Fenster"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_Ansicht/Nachrichten_quelle"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_Ansicht/_Zeige alle Kopfzeilen"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_Ansicht/Akt_ualisiere Ablageninhalt"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_Nachricht"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 msgid "/_Message/Recei_ve"
 msgstr "/_Nachricht/Empfang"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Nachricht/Empfang/Empfange vom aktuellen Account"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Nachricht/Empfang/Empfange von _allen Accounts"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Nachricht/Empfang/Empfan_g abbrechen"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Nachricht/Empfang/---"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/_Nachricht/Sende _wartende Nachrichten"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_Nachricht/Verfasse n_eue Nachricht"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_Nachricht/An_twort"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/_Nachricht/Ant_wort an"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Nachricht/Ant_wort an/_Alle"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Nachricht/Ant_wort an/Ab_sender"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Nachricht/Ant_wort an/Mailing-_Liste"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/_Nachricht/We_iterleiten"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Nachricht/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/_Nachricht/_Umadressieren"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_Nachricht/_Verschieben..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/_Nachricht/_Kopieren..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_Nachricht/_L旦schen"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_Nachricht/_Markieren"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Nachricht/_Markieren/_Markieren"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Nachricht/_Markieren/Markierung _entfernen"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_Nachricht/_Markieren/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Nachricht/_Markieren/Als _ungelesen"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Nachricht/_Markieren/Als _gelesen"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Nachricht/_Markieren/Alle _als gelesen"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/_Nachricht/Wieder_bearbeiten"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Werkzeug/Absender in Adress_buch einf端gen"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Werkzeug/Alle Nachrichten einer Ablage _filtern"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Werkzeug/Aus_gew辰hlte Nachrichten filtern"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Werkzeug/Filter _erstellen"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Werkzeug/Filter _erstellen/_Automatisch"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Von"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Werkzeug/Filter _erstellen/nach A_n"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Betreff"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Werkzeug/_L旦sche mehrfach vorhandene Nachrichten"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_Werkzeug/A_usf端hren"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/_Werkzeug/L_ogbuch-Fenster"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Einstellungen"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Einstellungen/Allgemeine _Einstellungen..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Einstellungen/_Filtereinstellungen..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_Einstellungen/_Schablone..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_Einstellungen/Aktionen..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Einstellungen/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Einstellungen/_Einstellungen f端r den aktuellen Account..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Einstellungen/_Neuen Account erstellen..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Einstellungen/Accounts _bearbeiten..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Einstellungen/Aktuellen Account _wechseln..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_Hilfe/_Anleitung"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/Anleitung/_English"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/Anleitung/_Japanese"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/_Hilfe/_FAQ"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hilfe/_FAQ/_English"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hilfe/_FAQ/_German"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hilfe/_FAQ/_Spanish"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hilfe/_FAQ/_French"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hilfe/_FAQ/_Italian"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_Hilfe/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Erstelle Hauptfenster...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "nicht"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Wechsle Fenstertrennungstyp von %d zu %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr "Verbindungslos"
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr "Sie sind nicht verbunden. Verbinden?"
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 msgid "Empty all trash"
 msgstr "Leere alle Papierk旦rbe"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 msgid "Empty messages in all trash?"
 msgstr "L旦sche alle Nachrichten in allen Papierk旦rben?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3152,16 +3160,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wird, wird\n"
 "sie automatisch durchsucht."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3170,141 +3178,141 @@ msgstr ""
 "Erstellen der Mailbox fehlgeschlagen.\n"
 "Vielleicht existieren einige Dateien, oder Sie haben keine Schreibrechte"
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/An_twort"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 msgid "/Reply to _all"
 msgstr "/Antwort an alle"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 msgid "/Reply to _sender"
 msgstr "/Ant_wort an Ab_sender"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Holen"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Neue E-Mail aufnehmen"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Hole alle"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "Neue E-Mail aller Accounts aufnehmen"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Senden wartender Nachrichten"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Antwort"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Nachricht beantworten"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "Alle beantworten"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Antwort an alle"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Nachricht weiterleiten"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Nachricht l旦schen"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Ausf端hren"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Markierten Prozess ausf端hren"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "N辰chste ungelesene Nachricht"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Einstellungen"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Accounteinstellungen"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 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:2445
+#: src/mainwindow.c:2447
 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:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
@@ -3426,28 +3434,28 @@ msgstr "Ende der Liste erreicht; weiter vom Anfang?"
 msgid "Search finished"
 msgstr "Suche beendet"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Erstelle Nachrichtenansicht...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Anh辰nge"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Drucken"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3456,7 +3464,7 @@ msgstr ""
 "Geben Sie den Druckbefehl ein:\n"
 "(`%s' wird durch den Dateinamen ersetzt)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3896,7 +3904,7 @@ msgstr "Lade alle Nachrichten vom Server herunter"
 msgid "Receive size limit"
 msgstr "Grenze f端r Nachrichteng旦��e beim Empfang"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "KB"
 
@@ -3916,7 +3924,7 @@ msgstr "(Ungefilterte Nachrichten werden in dieser Ablage gespeichert)"
 msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -3941,7 +3949,7 @@ msgstr "Erzeuge Nachrichten-ID"
 msgid "Add user-defined header"
 msgstr "F端ge benutzerdefinierte Kopfzeile ein"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Bearbeiten... "
 
@@ -4411,30 +4419,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Simplified Chinese (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4442,11 +4455,11 @@ msgstr ""
 "Wenn `Automatisch' gew辰hlt ist, wird die optimale\n"
 "Zeichensatzkodierung f端r die aktuelle Locale-Einstellung benutzt."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "��bertragungscodierung"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4454,118 +4467,118 @@ msgstr ""
 "Geben Sie die Inhalt-��bertragungs-Kodierung (Content-Transfer-Encoding) an\n"
 "die benutzt werden soll, wenn die Nachricht Nicht-ASCII-Zeichen enth辰lt."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Unterschriftentrenner"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Automatisch einf端gen"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Starte externen Editor automatisch"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "Stufen der R端ckg辰ngigmachung"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Zeilenumbruch nach"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "Zeichen"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Zitat umbrechen"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Bei der Eingabe umbrechen"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Zeilenumbruch vor dem Senden"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "W辰hle automatisch den Account f端r die Antworten"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Zitiere Nachricht in der Antwort"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "Antwort-Knopf f端hrt Antwort an Mailing-Liste aus"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Antwort-Format"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Zitatzeichen"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Weiterleiten-Format"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Beschreibung der Symbole "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Schriftart"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "��bersetze Kopfzeilennamen (wie `Von:', `Betreff:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Zeige Anzahl der ungelesenen E-Mails nach Ablagenname"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "K端rze Newsgroups l辰nger als"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "Zeichen"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Ablageninhaltsansicht"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Zeige Empf辰nger in `Von'-Spalte, wenn Sie selbst der Sender sind"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Threads entfalten"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Datumsformat"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " Setze Ablageninhalt-Eintr辰ge... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Benutze Farben f端r Nachrichten"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4573,328 +4586,328 @@ msgstr ""
 "Stelle Mehr-byte Alphabet und Zahlen als\n"
 "ASCII-Zeichen dar (nur Japanisch)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Zeige Kopfzeilenleiste 端ber Nachrichtenansicht"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Zeige kurze Kopfzeilen in der Nachrichtenansicht"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Zeilenabstand"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "Pixel"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Halbe Seite"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Flie��endes Scrollen"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Schritt"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr "Bilder"
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr "Gr旦��e angeh辰ngter Bilder in das Fenster einpassen"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 msgid "Display images as inline"
 msgstr "Anzeige Bilder eingebettet an"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "��berpr端fe digitale Unterschriften automatisch"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr ""
 "Zeige das Ergebnis der ��berpr端fung der digitalen Unterschrift in einem POPUP-"
 "Fenster an"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Mantra zeitweise speichern"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "L辰uft aus nach"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "Minute(n)"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "('0' speichert das Mantra f端r die gesamte\n"
 "Sitzung)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Eingabe sperren, bei der Eingabe eines Mantra"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Zeige Warnung beim Start, wenn GnuPG nicht funktioniert"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "Nachrichten immer 旦ffnen, wenn in der Ablageninhaltsansich ausgew辰hlt"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Erste Nachricht anzeigen beim ��ffnen einer Ablage"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Nachrichten als gelesen markieren, wenn sie in einem neuen Fenster ge旦ffnet "
 "werden"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "Zum Posteingang wechseln, nach dem Empfang neuer E-Mail"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Sofort Ausf端hren beim Bewegen oder L旦schen von Nachrichten"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Nachricht wird markiert bis zur Ausf端hrung,\n"
 " wenn das ausgeschaltet ist)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Empfangen-Dialog"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Zeige Empfangen-Dialog"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Immer"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr "Nur bei manuellem Empfang"
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Nie"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "Keinen Fehler-Dialog bei Empfangsfehlern erscheinen lassen"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Empfangen-Dialog schlie��en nach Beendigung"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " Tastenkombinationen w辰hlen... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externe Befehle (%s wird durch Dateinamen / URI ersetzt)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Internet-Browser"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "Adresse bei Doppel-Klick ins Ziel einf端gen"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "Beim Beenden"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Nachfragen beim Beenden"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "Leere Papierkorb beim Beenden"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Fragen vor dem Leeren"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Warnen, wenn wartende Nachrichten vorhanden"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O timeout:"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "Sekunde(n)"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "gek端rzter Wochentagsname"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "Wochentagsname"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "gek端rzter Monatsname"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "Monatsname"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "bevorzugtes Datums- und Zeitformat f端r die aktuelle Locale-Einstellung"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "Jahrhundert (Jahr/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "Tag des Monats als Zahl"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "Stunde als Zahl (24h Anzeige)"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "Stunde als Zahl (12h Anzeige)"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "Tag des Jahres als Zahl"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "Monat als Zahl"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "Minute als Zahl"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "entweder AM oder PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "Sekunde als Zahl"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "Wochentag als Zahl"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "bevorzugtes Datumsformat f端r die aktuelle Locale-Einstellung"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "letzten beiden Stellen des Jahres"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "Jahr als Zahl"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "Zeitzone oder Name oder Abk端rzung"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Steuerzeichen"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "Beispiel"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Setze Nachrichtenfarbe"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Farben"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Zitierter Text - Erste Ebene"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Zitierter Text - Zweite Ebene"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Zitierter Text - Dritte Ebene"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI-Link"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Stelle Zitatfarben wiederher"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "W辰hle Farbe f端r Zitatebene 1"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "W辰hle Farbe f端r Zitatebene 2"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "W辰hle Farbe f端r Zitatebene 3"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "W辰hle Farbe f端r URI"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Beschreibung der Symbole"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4918,11 +4931,11 @@ msgstr ""
 "News-Gruppen\n"
 "Nachrichten-ID"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Wenn x gesetzt ist, zeige expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4936,7 +4949,7 @@ msgstr ""
 "Zitierter Nachrichteninhalt ohne Unterschrift\n"
 "W旦rtlich %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4948,15 +4961,15 @@ msgstr ""
 "旦ffnende Klammer\n"
 "schlie��ende Klammer"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Schriftauswahl"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Tastenkombinationen"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4967,11 +4980,11 @@ msgstr ""
 "Men端eintrag\n"
 "ist, k旦nnen Sie die Abk端rzungstastenkombination jedes Men端eintrags 辰ndern."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Altes Sylpheed"
 
@@ -5039,190 +5052,185 @@ msgstr "Filtereinstellungen"
 msgid "Enabled"
 msgstr "An"
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Wollen Sie wirklich diese Regel l旦schen?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Unbenannt"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "L旦sche Regel"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 msgid "Filter rule"
 msgstr "Filterregel"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr "Wenn eine der folgenden Bedingungen zutrifft"
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr "Wenn alle der folgenden Bedingungen zutriffen"
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr "Die folgenden Aktionen ausf端hren:"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr "An oder Cc"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 msgid "Any header"
 msgstr "Jede Kopfzeile"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 msgid "Edit header..."
 msgstr "Kopfzeile bearbeiten..."
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 msgid "Message body"
 msgstr "Nachrichtenkrper"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr "Ergebnis des Befehls"
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr "Alter"
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "enthalten"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 msgid "doesn't contain"
 msgstr "nicht enthalten"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr "ist"
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr "ist nicht"
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr "entspricht Regex"
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr "entspricht nicht Regex"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr "ist gr旦��er als"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr "ist kleiner als"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr "ist l辰nger als"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr "ist k端rzer als"
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Bewege zu"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 msgid "Copy to"
 msgstr "Kopiere nach"
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Nicht empfangen"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 msgid "Delete from server"
 msgstr "Vom Server l旦schen"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 msgid "Set mark"
 msgstr "Setze Markierung"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 msgid "Set color"
 msgstr "Setze Farbe"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 msgid "Mark as read"
 msgstr "Markieren als gelesen"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 msgid "Forward as attachment"
 msgstr "Weiterleiten als Anhang"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 msgid "Redirect"
 msgstr "Umadressieren"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 msgid "Execute command"
 msgstr "Befehl ausf端hren"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr "Beende Regelauswertung"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 msgid "folder:"
 msgstr "Ablage:"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 msgid "address:"
 msgstr "Adresse:"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 msgid "Edit header list"
 msgstr "Kopfzeile bearbeiten..."
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 msgid "Headers"
 msgstr "Kopfzeilen"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 msgid "Header:"
 msgstr "Kopfzeilen:"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 msgid "Rule name is not specified."
 msgstr "Regelname wurde nicht angegeben."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 msgid "Command is not specified."
 msgstr "Befehl wurde nicht gesetzt."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr "Es existiert eine ung端ltige Bedingung."
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 msgid "Destination folder is not specified."
 msgstr "Zielablage wurde nicht angegeben."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr "Es existiert eine ung端ltige Aktion."
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 msgid "Condition not exist."
 msgstr "Die Bedingung existiert nicht."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 msgid "Action not exist."
 msgstr "Die Aktion existiert nicht."
 
@@ -5486,56 +5494,56 @@ msgstr "Verbinde"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Verbindung mit SMTP-Server: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "Sende HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "Beglaubigen"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "Sende Nachricht..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "Sende EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "Sende MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "Sende"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "Sende RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "Sende DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Beende..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Sende Nachricht (%d / %d bytes)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "Sende Nachricht"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "Fehler aufgetreten beim Senden der Nachricht."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5852,120 +5860,120 @@ msgstr "Nr."
 msgid "Creating summary view...\n"
 msgstr "Erstelle Ablageninhaltsansicht...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Markierte verarbeiten"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Einige Markierungen sind 端brig. Verarbeiten?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Durchsuche Ablage (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "Keine ungelesenen Nachrichten."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Gehe zu n辰chster Ablage?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "Weitersuchen"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "Keine weiteren neuen ungelesenen Nachrichten"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "Keine neue Nachricht gefunden. Gehe zu n辰chster Ablage?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "Keine markieten Nachrichten."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "Keine markierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Keine weiteren etikettierten Nachrichten"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "Keine etikettierten Nachrichten."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Ziehe Nachrichten nach Betreff an..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d gel旦scht"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " Eintr辰ge gew辰hlt"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt"
@@ -6137,6 +6145,9 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "Schreiben in %s fehlgeschlagen.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Alle Ablagenb辰ume erneuern..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_Ansicht/_Zeichensatz/---"
 
diff --git a/po/el.po b/po/el.po
index e938fa8e..20483d15 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+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"
@@ -66,11 +66,11 @@ msgstr ""
 "Foundation) ����侶 隆旅竜��慮��僚��侶 Free Software Foundation, Inc., 59 Temple Place - "
 "Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "��旅留硫略龍�� ��旅�� ����慮亮溜��竜旅�� 粒旅留 虜略慮竜 了凌粒留��旅留��亮��...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -79,26 +79,26 @@ msgstr ""
 "��留��留虜留了�� 虜了竜溜����竜 ��了留 ��留 ��留��略慮����留 ����僚慮竜��侶�� 亮侶僚��亮留��凌�� ����旅僚 竜��竜両竜��粒留����竜溜��竜 ��凌���� "
 "了凌粒留��旅留��亮凌����."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "��僚凌溜粒�� ��凌 ��留��略慮����凌 竜��竜両竜��粒留��溜留�� 了凌粒留��旅留��亮凌��...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "��侶亮旅凌����粒�� ��凌 ��留��略慮����凌 竜��竜両竜��粒留��溜留�� 了凌粒留��旅留��亮凌��...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "����竜両竜��粒留��溜留 了凌粒留��旅留��亮�ﾎ�"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
 msgstr ""
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -106,60 +106,66 @@ msgstr ""
 msgid "Name"
 msgstr "��僚凌亮留"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "����������虜凌了了凌"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "��両����侶��劉��侶��"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "����凌��慮流虜侶"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "����竜両竜��粒留��溜留"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " ��旅留粒��留��流"
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "��略����"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "��略僚��"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " ��劉��竜 ���� ����僚侶慮侶 了凌粒留��旅留��亮�� "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "��劉了竜��竜 ����略粒亮留��旅 僚留 隆旅留粒��略��竜��竜 留������ ��凌 了凌粒留��旅留��亮��;"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "律����溜�� ��溜��了凌"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "��旅留粒��留��流 了凌粒留��旅留��亮凌��"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "��劉了竜��竜 ����略粒亮留��旅 僚留 隆旅留粒��略��竜��竜 留������ ��凌 了凌粒留��旅留��亮��;"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "��留旅"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+����旅"
 
@@ -225,7 +231,7 @@ msgstr "����凌����凌了流"
 msgid "Abort"
 msgstr "裡��竜��旅虜略"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -235,11 +241,11 @@ msgstr ""
 "��旅��略粒竜��竜 ��侶僚 粒��留亮亮流 竜僚��凌了流�� 竜虜����������侶��:\n"
 "(里凌 `%s' 慮留 留僚��旅虜留��留����留慮竜溜 亮竜 ��凌 ��僚凌亮留 留����竜溜凌��)"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -249,7 +255,7 @@ msgstr ""
 "��旅��略粒竜��竜 ��侶僚 粒��留亮亮流 竜僚��凌了流�� 竜虜����������侶��:\n"
 "(里凌 `%s' 慮留 留僚��旅虜留��留����留慮竜溜 亮竜 ��凌 ��僚凌亮留 留����竜溜凌��)"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr ""
 
@@ -257,7 +263,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "����凌��慮流虜侶 隆旅竜��慮��僚��侶�� ����凌 硫旅硫了溜凌"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "��旅竜��慮��僚��侶"
@@ -345,8 +351,8 @@ msgstr "/��旅竜��慮��僚��侶/����竜両竜��粒留��溜留"
 msgid "/_Address/_Delete"
 msgstr "/��旅竜��慮��僚��侶/��旅留粒��留��流"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 #, fuzzy
 msgid "/_Tools"
 msgstr "/����粒留了竜溜留"
@@ -356,13 +362,13 @@ msgstr "/����粒留了竜溜留"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/������竜溜凌/��旅��留粒��粒流 留����竜溜凌�� mbox..."
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/��凌流慮竜旅留"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/��凌流慮竜旅留/裡��竜��旅虜略"
 
@@ -379,10 +385,10 @@ msgid "/New _Folder"
 msgstr "/��劉凌�� 虜留��略了凌粒凌��"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -401,17 +407,17 @@ msgstr "/��旅留粒��留��流"
 msgid "E-Mail address"
 msgstr "��旅竜��慮��僚��侶 e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "��留��略了凌粒凌�� 隆旅竜��慮��僚��竜��僚"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "��僚凌亮留:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -574,7 +580,7 @@ msgid "Group"
 msgstr "��劉留��亮略隆留"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "��留��略了凌粒凌��"
 
@@ -600,7 +606,7 @@ msgstr "��凌旅僚劉�� 隆旅竜��慮��僚��竜旅��"
 msgid "Personal address"
 msgstr "����凌������旅虜劉�� 隆旅竜��慮��僚��竜旅��"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "裡侶亮竜溜����侶"
 
@@ -608,7 +614,7 @@ msgstr "裡侶亮竜溜����侶"
 msgid "Warning"
 msgstr "����凌竜旅隆凌��凌溜侶��侶"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "裡��略了亮留"
 
@@ -620,31 +626,31 @@ msgstr "��侶亮旅凌����粒�� ��凌 隆旅略了凌粒凌 alert panel...\n"
 msgid "Show this message next time"
 msgstr "��留 竜亮��留僚旅����竜溜 留������ ��凌 亮流僚��亮留 ��侶僚 竜����亮竜僚侶 ��凌��略"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "��凌����凌虜留了溜"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "����虜虜旅僚凌"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "痢凌龍"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "������留僚溜"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "����了竜"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "����略��旅僚凌"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "��留��劉"
 
@@ -652,7 +658,7 @@ msgstr "��留��劉"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "里劉了凌��"
 
@@ -664,8 +670,8 @@ msgstr "/����凌��慮流虜侶..."
 msgid "/_Remove"
 msgstr "/��旅留粒��留��流"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/��隆旅����侶��竜��..."
@@ -837,8 +843,8 @@ msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/����竜旅虜��僚旅��侶/---"
 
@@ -868,7 +874,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -951,144 +957,149 @@ msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌/����了凌��凌旅侶亮劉僚凌
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌/����了凌��凌旅侶亮劉僚凌 ��旅僚竜龍旅虜�� (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌/��留��留隆凌��旅留虜�� ��旅僚竜龍旅虜�� (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌/��留��留隆凌��旅留虜�� ��旅僚竜龍旅虜�� (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌/��凌��竜略��旅虜凌 (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌/��旅僚竜龍旅虜�� (ISO-2022-_CN)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌/������旅了了旅虜�� (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/����粒留了竜溜留/��留��略了凌粒凌�� 隆旅竜��慮��僚��竜��僚"
 
-#: src/compose.c:667
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/������竜溜凌/��旅留粒��留��流"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/��虜��劉了竜��侶"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/����粒留了竜溜留"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/����竜両竜��粒留��溜留/����竜両竜��粒留��溜留 亮竜 竜両����竜��旅虜�� ������粒��留亮亮留"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/��虜��劉了竜��侶"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/��流僚��亮留/����������凌粒��略��侶��侶"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ��凌 留����竜溜凌 隆竜僚 ����略����竜旅\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "��竜僚 亮��凌���� 僚留 了略硫�� ��凌 ��亮流亮留 虜竜旅亮劉僚凌��\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr ""
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr ""
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "里凌 留����竜溜凌 %s 隆竜僚 ����略����竜旅\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "��竜僚 亮��凌���� 僚留 硫���� ��凌 亮劉粒竜慮凌�� ��凌�� 留����竜溜凌�� %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "里凌 留����竜溜凌 %s 竜溜僚留旅 略隆竜旅凌\n"
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "隆竜僚 亮��凌���� 僚留 隆侶亮旅凌����粒流���� %s\n"
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "��流僚��亮留: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "��竜僚 亮��凌���� 僚留 了略硫�� ��凌 ��亮流亮留 ��凌�� ��凌了����亮侶亮留��旅虜凌�� 亮侶僚��亮留��凌��"
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [里��凌��凌��凌旅侶亮劉僚凌]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 裡��僚慮竜��侶 亮侶僚��亮留��凌��%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "裡��僚慮竜��侶 亮侶僚��亮留��凌��%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "�� ��留��留了流����侶�� 隆竜僚 劉��竜旅 凌��旅����竜溜."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "����凌����凌了流"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "隆竜僚 亮��凌���� 僚留 ��略���� ��侶僚 了溜����留 ��留��留了侶�����ﾎ�"
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1096,173 +1107,173 @@ msgstr ""
 "�� 了凌粒留��旅留��亮���� 粒旅留 留��凌����凌了流 亮侶僚��亮留��凌�� 隆竜僚 劉��竜旅 凌��旅����竜溜.\n"
 "��留��留虜留了�� 竜��旅了劉両��竜 劉僚留 了凌粒留��旅留��亮�� ����旅僚 ����竜溜了竜��竜."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "裡��僚劉硫侶 ����略了亮留 虜留��略 ��侶僚 留��凌����凌了流 ��凌�� 亮侶僚��亮留��凌�� ��竜 %s ."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "��竜僚 亮��凌���� 僚留 留��凌慮侶虜竜������ ��凌 亮流僚��亮留 ����留 竜両竜������亮竜僚留."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "隆竜僚 亮��凌���� 僚留 留了了略両�� ��凌 mode ��凌�� 留����竜溜凌��\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
 "Send it as %s anyway?"
 msgstr "��竜僚 亮��凌���� 僚留 留了了略両�� ��凌 虜��隆旅虜凌����僚凌了凌 ��凌�� 亮侶僚��亮留��凌��."
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "隆竜僚 亮��凌���� 僚留 粒��略���� ��侶僚 虜竜��留了溜隆留\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "隆竜僚 亮��凌���� 僚留 留��留旅��劉���� ��凌 ��留了旅�� 亮流僚��亮留\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "硫略龍�� ��凌 亮流僚��亮留 ����侶僚 凌����略...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "隆竜僚 亮��凌���� 僚留 竜��旅了劉両�� ��凌僚 虜留��略了凌粒凌: %s\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "隆竜僚 亮��凌���� 僚留 硫略了�� ��凌 亮流僚��亮留 ����侶僚 凌����略\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generated Message-ID: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "��侶亮旅凌����粒�� ��凌 ��留��略慮����凌 ����僚慮竜��侶��...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "������凌�� MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "��劉粒竜慮凌��"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "������:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "����凌����凌了流 亮侶僚��亮留��凌��"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr ""
 "����凌����凌了流\n"
 "留��粒����竜��留"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "里凌��凌慮劉��侶��侶 ����凌僚 虜留��略了凌粒凌 凌����略�� 虜留旅 留��凌����凌了流 留��粒����竜��留"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "��������竜旅��留"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "����凌慮流虜竜����侶 ����凌僚 虜留��略了凌粒凌 ����凌��竜溜����僚"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "��旅��留粒��粒流"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "��旅��留粒��粒流 留����竜溜凌��"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "����凌��略����侶��侶"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "����凌��略����侶��侶 留����竜溜凌��"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Y��凌粒��留��流"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "��旅��留粒��粒流 ����凌粒��留��流��"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "裡��僚慮劉��侶��"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "����竜両竜��粒留��溜留 亮竜 竜両����竜��旅虜�� ������粒��留亮亮留"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr ""
 "里��了旅両侶\n"
 "粒��留亮亮流��"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "��僚留隆溜��了����侶 粒��留亮亮�ﾎ�"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "��侶 劉粒虜����凌�� ������凌�� MIME"
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "里凌 留����竜溜凌 隆竜僚 ����略����竜旅, 流 竜溜僚留旅 略隆竜旅凌."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 #, fuzzy
 msgid "Properties"
 msgstr "��隆旅����侶��竜��"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "����隆旅虜凌��凌溜侶��侶"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "��旅略隆��凌亮凌��"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "��僚凌亮留 留����竜溜凌��"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "�� 竜僚��凌了流 粒旅留 ��凌 竜両����竜��旅虜�� ������粒��留亮亮留 隆竜僚 竜溜僚留旅 劉粒虜����侶: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1273,73 +1284,73 @@ msgstr ""
 "��留 竜��旅硫略了了�� ��竜��亮留��旅��亮�� ��侶�� 隆旅竜��粒留��溜留��;\n"
 "process group id:  %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "里竜��亮留��溜����侶虜竜 process group id: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "����凌������旅僚�� 留����竜溜凌: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "裡��僚慮竜��侶: 竜旅��留粒��粒流 留���� ��留��留虜凌了凌��慮凌��亮竜僚侶 隆旅竜��粒留��溜留\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "��竜僚 亮������竜��留 僚留 虜留了劉���� ��凌 竜両����竜��旅虜�� ������粒��留亮亮留 竜��竜両竜��粒留��溜留��\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "��竜僚 亮������竜��留 僚留 粒��略���� ����凌 留����竜溜凌\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "����凌������溜留 留僚略粒僚����侶�� 留���� ��凌 pipe\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "��竜僚 亮��凌���� 僚留 硫略了�� ����侶僚 凌����略 ��凌 亮流僚��亮留."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "����旅了凌粒流 留����竜溜凌��"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "����旅了凌粒流 留����竜溜凌��"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "����������旅��侶 亮侶僚��亮留��凌��"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "�������� ��凌 亮流僚��亮留 劉��竜旅 ����凌��凌��凌旅侶慮竜溜, 僚留 留��凌����旅��慮竜溜;"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "����������旅��侶"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "����留 ��������竜旅��留"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "��劉了竜��竜 ����略粒亮留��旅 僚留 隆旅留粒��留��竜溜 留����流 侶 虜竜��留了溜隆留;"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 #, fuzzy
 msgid "Apply template"
 msgstr "��旅留粒��留��流 亮侶僚��亮留��凌��"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 #, fuzzy
 msgid "Replace"
 msgstr "����略僚��侶��侶"
@@ -1504,12 +1515,12 @@ msgstr "����竜両竜��粒留��溜留 虜留��留了��粒凌��"
 msgid "Input the new name of folder:"
 msgstr "��旅��略粒竜��竜 ��凌 僚劉凌 ��僚凌亮留 ��凌�� 虜留��留了��粒凌��:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "��劉凌�� 虜留��略了凌粒凌��"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "��旅��略粒竜��竜 ��凌 ��僚凌亮留 ��凌�� 僚劉凌�� 虜留��留了��粒凌��:"
 
@@ -1683,173 +1694,168 @@ msgstr "留��劉������留 僚留 粒��略���� ��旅�� ����慮亮溜��竜旅�� ����凌 留����竜
 msgid "Select folder"
 msgstr "����旅了凌粒流 虜留��留了��粒凌��"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "��旅��竜������亮竜僚留"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 #, fuzzy
 msgid "Sent"
 msgstr "����凌����凌了流"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "������略"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "��旅留粒��留亮亮劉僚留"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 #, fuzzy
 msgid "Drafts"
 msgstr "��������竜旅��留"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "��凌 `%c' 隆竜僚 亮��凌��竜溜 僚留 ����亮��竜��旅了留亮硫略僚竜��留旅 ��竜 ��僚凌亮留 虜留��留了��粒凌��."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "�� 虜留��略了凌粒凌�� `%s' ����略����竜旅 流隆侶."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "隆竜僚 亮��凌���� 僚留 隆侶亮旅凌����粒流���� ��凌僚 虜留��略了凌粒凌 `%s'."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/��侶亮旅凌����粒溜留 僚劉凌�� 虜留��留了��粒凌��..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/��竜��凌僚凌亮留��溜留 虜留��留了��粒凌��..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/��旅留粒��留��流 虜留��留了��粒凌��"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "��隆竜旅留��亮留 隆旅留粒��留亮亮劉僚��僚"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 #, fuzzy
 msgid "/_Check for new messages"
 msgstr "裡��僚慮竜��侶 僚劉凌�� 亮侶僚��亮留��凌��"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/��僚侶亮劉������侶 隆凌亮流�� 虜留��留了��粒��僚"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 #, fuzzy
 msgid "/_Search messages..."
 msgstr "\t��僚留龍流��侶��侶 ����留 留����凌����劉了留����留 亮侶僚��亮留��留... "
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "��竜僚 ����略����凌��僚 留隆旅略硫留����留 亮侶僚��亮留��留"
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 #, fuzzy
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/裡��僚隆��凌亮流 ��竜 newsgroup..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/��旅留粒��留��流 newsgroup"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "��侶亮旅凌����粒�� ��侶僚 留��竜旅虜��僚旅��侶 虜留��留了��粒��僚...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "��劉留"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "��隆旅略硫留����留"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "留��."
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "��劉���� ��旅�� ��了侶��凌��凌��溜竜�� 虜留��留了��粒��僚...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "��劉���� ��旅�� ��了侶��凌��凌��溜竜�� 虜留��留了��粒��僚..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "裡略������侶 虜留��留了��粒��僚 %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "裡略������侶 虜留��留了��粒凌�� %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/��僚侶亮劉������侶 隆凌亮流�� 虜留��留了��粒��僚"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "��僚侶亮劉������侶 ��侶�� 隆凌亮流�� 虜留��留了��粒��僚..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "��僚侶亮劉������侶 ��侶�� 隆凌亮流�� 虜留��留了��粒��僚..."
 
-#: src/folderview.c:732
-#, fuzzy
-msgid "Rebuilding all folder trees..."
-msgstr "裡略������侶 虜留��留了��粒凌�� %s ..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "裡��僚慮竜��侶 僚劉凌�� 亮侶僚��亮留��凌��"
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "�� 虜留��略了凌粒凌�� %s 竜溜僚留旅 竜��旅了竜粒亮劉僚凌��\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "����凌����凌了流 亮侶僚��亮留��凌��"
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "裡��僚劉硫侶 ����略了亮留 虜留��略 ��侶僚 留��凌����凌了流 ��凌�� 亮侶僚��亮留��凌�� ��竜 %s ."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1859,16 +1865,16 @@ msgstr ""
 "(留僚 慮劉了竜��竜 僚留 隆侶亮旅凌����粒流��竜��竜 劉僚留 虜留��略了凌粒凌 粒旅留 僚留 硫略了竜��竜 ����凌虜留��留了��粒凌����\n"
 " ����凌��慮劉����竜 ��凌 `/' ����凌 ��劉了凌�� ��凌�� 凌僚��亮留��凌��)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "���ﾏ���竜 僚劉凌 ��僚凌亮留 粒旅留 `%s':"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "��竜��凌僚凌亮留��溜留 虜留��留了��粒凌��"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1877,24 +1883,24 @@ msgstr ""
 "��了凌旅 凌旅 虜留��略了凌粒凌旅 虜留旅 ��留 亮侶僚��亮留��留 虜略���� 留���� ��凌 `%s' 慮留 隆旅留粒��留��凌��僚.\n"
 "��劉了竜��竜 ����略粒亮留��旅 僚留 隆旅留粒��留��凌��僚;"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "��旅留粒��留��流 虜留��留了��粒凌��"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "��竜僚 亮��凌���� 僚留 隆旅留粒��略���� ��凌僚 虜留��略了凌粒凌 `%s'."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "��隆竜旅留��亮留 隆旅留粒��留亮亮劉僚��僚"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "��留 留隆竜旅略���� ��了留 ��留 隆旅留粒��留亮亮劉僚留 亮侶僚��亮留��留"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1903,35 +1909,35 @@ msgstr ""
 "裡溜粒凌����留 僚留 隆旅留粒��留��竜溜 ��凌 mailbox `%s' ;\n"
 "(里留 亮侶僚��亮留��留 ������ ��硫流僚凌僚��留旅 留���� ��凌僚 隆溜��虜凌)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/��旅留粒��留��流 mailbox"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "裡溜粒凌����留 僚留 隆旅留粒��留��竜溜 凌 IMAP4 了凌粒留��旅留��亮���� `%s';"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "��旅留粒��留��流 了凌粒留��旅留��亮凌�� IMAP4"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "裡溜粒凌����留 僚留 隆旅留粒��留��竜溜 ��凌 newsgroup `%s';"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "��旅留粒��留��流 newsgroup"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "裡溜粒凌����留 僚留 隆旅留粒��留��竜溜 凌 了凌粒留��旅留��亮���� news `%s';"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "��旅留粒��留��流 了凌粒留��旅留��亮凌�� news"
 
@@ -1984,7 +1990,7 @@ msgstr ""
 msgid "Can't retrieve newsgroup list."
 msgstr "隆竜僚 亮��凌���� 僚留 ��略���� ��侶僚 了溜����留 ����僚 newsgroup"
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "里劉了凌��"
 
@@ -2284,7 +2290,7 @@ msgstr ""
 msgid "Prev"
 msgstr "����旅了凌粒劉��"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "������亮竜僚凌"
 
@@ -2378,7 +2384,7 @@ msgstr "裡��僚隆劉凌亮留旅 ����凌僚 POP3 server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "��竜僚 亮��凌���� 僚留 ����僚隆竜慮�� ����凌僚 POP3 server: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "��旅����凌��凌溜侶��侶"
 
@@ -2408,7 +2414,7 @@ msgstr "��留亮硫略僚�� ��凌 亮劉粒竜慮凌�� ����僚 亮侶僚��亮略����僚 (LIST)..."
 msgid "Deleting message %d"
 msgstr "��旅留粒��略���� ��凌 亮流僚��亮留"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "��了竜溜僚�� ��侶 ����僚隆竜��侶"
 
@@ -2452,7 +2458,8 @@ msgstr "��竜僚 亮��凌���� 僚留 粒��略���� ��竜 留����竜溜凌.\n"
 msgid "Socket error."
 msgstr "����略了亮留 ��������凌虜��了了凌��\n"
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2468,19 +2475,19 @@ msgid ""
 "%s"
 msgstr "痢��慮亮溜��竜旅�� Mailbox"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 #, fuzzy
 msgid "Authentication failed."
 msgstr "��旅����凌��凌溜侶��侶"
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "��旅����凌��凌溜侶��侶"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr ""
 
@@ -2947,356 +2954,356 @@ msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌/��留����僚劉龍旅虜凌 (_EU
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌/��留����僚劉龍旅虜凌 (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌/��旅僚竜龍旅虜�� (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌/��凌��竜略��旅虜凌 (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 #, fuzzy
 msgid "/_View/Open in new _window"
 msgstr "/��僚凌旅粒亮留 ��竜 僚劉凌 ��留��略慮����凌"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/����竜旅虜��僚旅��侶/��亮��略僚旅��侶 ��凌�� ��侶粒留溜凌��"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/����竜旅虜��僚旅��侶/��亮��略僚旅��侶 ��侶�� ��了流��凌���� 虜竜��留了溜隆留��"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/��流僚��亮留"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/��流僚��亮留/����留僚-竜��竜両竜��粒留��溜留"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/��流僚��亮留/��流��侶 留���� ��了凌���� ��凌���� 了凌粒留��旅留��亮凌����"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/��流僚��亮留/��流��侶 留���� ��了凌���� ��凌���� 了凌粒留��旅留��亮凌����"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/��流僚��亮留/����凌����凌了流 留��粒����竜��留"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/��流僚��亮留/����留僚-竜��竜両竜��粒留��溜留"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/��流僚��亮留/����凌����凌了流 亮侶僚��亮略����僚 留���� ��侶僚 凌����略"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/��流僚��亮留/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/��流僚��亮留/裡��僚慮竜��侶 僚劉凌�� 亮侶僚��亮留��凌��"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/��流僚��亮留/����略僚��侶��侶"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/��流僚��亮留/����略僚��侶��侶 ��竜"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/��流僚��亮留/����略僚��侶��侶 ��竜 ��了凌����"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/��流僚��亮留/����略僚��侶��侶 ����凌僚 留��凌����凌了劉留"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/��流僚��亮留/����略僚��侶��侶 ��竜 ��了凌����"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/��流僚��亮留/����凌�ﾎ故系�侶"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/��流僚��亮留/����凌�ﾎ故系�侶 ��留僚 ����凌��略����侶��侶"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/��流僚��亮留/����留僚-竜��竜両竜��粒留��溜留"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/��流僚��亮留/��竜��留虜溜僚侶��侶..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/��流僚��亮留/��僚��旅粒��留��流..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/��流僚��亮留/��旅留粒��留��流"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/��流僚��亮留/裡流亮留僚��侶"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/M流僚��亮留/裡流亮留僚��侶/裡流亮留僚��侶"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/M流僚��亮留/裡流亮留僚��侶/��僚留溜��竜��侶 ��流亮留僚��侶��"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/M流僚��亮留/裡流亮留僚��侶/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/M流僚��亮留/裡流亮留僚��侶/裡流亮留僚��侶 ���� 留隆旅略硫留����凌"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/M流僚��亮留/裡流亮留僚��侶/裡流亮留僚��侶 ���� 隆旅留硫留��亮劉僚凌"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/M流僚��亮留/裡流亮留僚��侶/裡流亮留僚��侶 ��了��僚 ���� 隆旅留硫留��亮劉僚留"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/��流僚��亮留/����留僚-竜��竜両竜��粒留��溜留"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/����凌��慮流虜侶 留��凌����凌了劉留 ����凌僚 虜留��略了凌粒凌 隆旅竜��慮��僚��竜��僚"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/��竜��溜了侶��侶/陸旅了����略��旅��亮留 亮侶僚��亮略����僚"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/��竜��溜了侶��侶/陸旅了����略��旅��亮留 亮侶僚��亮略����僚"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/��竜��溜了侶��侶/陸旅了����略��旅��亮留 亮侶僚��亮略����僚"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/��竜��溜了侶��侶/陸旅了����略��旅��亮留 亮侶僚��亮略����僚"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/��竜��溜了侶��侶/陸旅了����略��旅��亮留 亮侶僚��亮略����僚"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/��竜��溜了侶��侶/陸旅了����略��旅��亮留 亮侶僚��亮略����僚"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/��竜��溜了侶��侶/陸旅了����略��旅��亮留 亮侶僚��亮略����僚"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/��竜��溜了侶��侶/��旅留粒��留��流 隆旅��了�ﾎ� 亮侶僚��亮略����僚"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/��虜��劉了竜��侶"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/����粒留了竜溜留/��留��略慮����凌 虜留��留粒��留��流��"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/痢��慮亮溜��竜旅��"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/痢��慮亮溜��竜旅��/��凌旅僚劉�� 竜��旅了凌粒劉��..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/痢��慮亮溜��竜旅��/����旅了凌粒劉�� ��溜了������僚..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Configuration/_Template..."
 msgstr "/痢��慮亮溜��竜旅��/����旅了凌粒劉�� ��溜了������僚..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/痢��慮亮溜��竜旅��/����竜両竜��粒留��溜留 了凌粒留��旅留��亮�ﾎ�..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/痢��慮亮溜��竜旅��/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/痢��慮亮溜��竜旅��/����旅了凌粒劉�� 留僚略 了凌粒留��旅留��亮��..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/痢��慮亮溜��竜旅��/��侶亮旅凌����粒溜留 僚劉凌�� 了凌粒留��旅留��亮凌��..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/痢��慮亮溜��竜旅��/����竜両竜��粒留��溜留 了凌粒留��旅留��亮�ﾎ�..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/痢��慮亮溜��竜旅��/��了了留粒流 ����劉��凌僚��凌�� 了凌粒留��旅留��亮凌��"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/��凌流慮竜旅留/_Manual"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/��凌流慮竜旅留/_Manual/��粒粒了旅虜��"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/��凌流慮竜旅留/_Manual/��留����僚劉龍旅虜凌"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/��凌流慮竜旅留/裡��竜��旅虜略"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/��凌流慮竜旅留/_Manual/��粒粒了旅虜��"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/��凌流慮竜旅留/_Manual/��粒粒了旅虜��"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/��凌流慮竜旅留/_Manual/��粒粒了旅虜��"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/��凌流慮竜旅留/_Manual/��粒粒了旅虜��"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/��凌流慮竜旅留/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "��侶亮旅凌����粒�� ��凌 虜����溜���� ��留��略慮����凌...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 侶 虜留��留僚凌亮流 ������亮略����僚 %d 留��劉������竜\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "劉粒旅僚竜.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "律����溜�� ��溜��了凌"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "虜留僚劉僚留"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "��隆竜旅留��亮留 隆旅留粒��留亮亮劉僚��僚"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "��留 留隆竜旅略���� ��了留 ��留 隆旅留粒��留亮亮劉僚留 亮侶僚��亮留��留"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "����凌��慮流虜侶 mailbox"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3306,16 +3313,16 @@ msgstr ""
 "��僚 凌��旅����竜溜 ��凌 ����略����凌僚 mailbox, 慮留\n"
 "��留����慮竜溜 留������亮留��留."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "里凌 mailbox `%s' ����略����竜旅 流隆侶"
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3324,151 +3331,151 @@ msgstr ""
 "�� 隆侶亮旅凌����粒溜留 ��凌�� mailbox 留��劉������竜.\n"
 "�������� 虜略��凌旅留 留����竜溜留 僚留 ����略����凌��僚 流隆侶, 流 隆竜僚 劉��竜��竜 隆旅虜留溜��亮留 僚留 粒��略��竜��竜 竜虜竜溜. "
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/����略僚��侶��侶"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "����略僚��侶��侶 ��竜 ��了凌����"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/����略僚��侶��侶 ����凌僚 留��凌����凌了劉留"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/����略僚��侶��侶 ��竜 ��了凌����"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/����凌�ﾎ故系�侶"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/����凌�ﾎ故系�侶 ���� ����凌��略����侶��侶"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/����留僚-竜��竜両竜��粒留��溜留"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "��流��侶"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "��流��侶 僚劉凌�� mail"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr ""
 "��流��侶\n"
 "��了��僚"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "��流��侶 僚劉凌�� mail 留���� ��了凌���� ��凌���� 了凌粒留��旅留��亮凌����"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "����凌����凌了流 ��了��僚 ����僚 亮侶僚��亮略����僚 留���� ��侶僚 凌����略"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "裡��僚慮竜��侶"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "裡��僚慮竜��侶 僚劉凌�� 亮侶僚��亮留��凌��"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "����略僚��侶��侶"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "����略僚��侶��侶 ����凌 亮流僚��亮留"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr ""
 "����略僚��侶��侶\n"
 "��了��僚"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "����略僚��侶��侶 ��竜 ��了凌����"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "����凌�ﾎ故系�侶"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "����凌�ﾎ故系�侶 亮侶僚��亮留��凌��"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "��旅留粒��留��流 亮侶僚��亮留��凌��"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "��虜��劉了竜��侶"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "��虜��劉了竜��侶 ��侶亮竜旅��亮劉僚侶�� 竜��粒留��溜留��"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "������亮竜僚凌 留隆旅略硫留����凌 亮流僚��亮留"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "����旅了凌粒劉��"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 #, fuzzy
 msgid "Common preferences"
 msgstr "��凌旅僚劉�� ����旅了凌粒劉��"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "��凌粒/��亮����"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "痢��慮亮溜��竜旅�� 了凌粒留��旅留��亮凌��"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "��両凌隆凌��"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "��両凌隆凌�� 留���� 留������ ��凌 ������粒��留亮亮留;"
 
@@ -3591,29 +3598,29 @@ msgstr "������留��留 ��凌 ��劉了凌�� ��侶�� 了溜����留��. ��留 ����僚竜��溜����
 msgid "Search finished"
 msgstr "�� 留僚留龍流��侶��侶 ��竜了竜溜����竜"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "��侶亮旅凌����粒�� 留��竜旅虜��僚旅��侶 亮侶僚��亮留��凌��...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "��竜溜亮竜僚凌"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 #, fuzzy
 msgid "Attachments"
 msgstr "����凌��略����侶��侶"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "��竜僚 亮��凌���� 僚留 隆旅留粒��略���� ��凌僚 虜留��略了凌粒凌 `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "��虜����������侶"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3622,7 +3629,7 @@ msgstr ""
 "��旅��略粒竜��竜 ��侶僚 粒��留亮亮流 竜僚��凌了流�� 竜虜����������侶��:\n"
 "(里凌 `%s' 慮留 留僚��旅虜留��留����留慮竜溜 亮竜 ��凌 ��僚凌亮留 留����竜溜凌��)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4072,7 +4079,7 @@ msgstr "��流��侶 ��了��僚 ����僚 亮侶僚��亮略����僚 留���� ��凌僚 竜両����侶��劉
 msgid "Receive size limit"
 msgstr ""
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr ""
 
@@ -4096,7 +4103,7 @@ msgstr ""
 msgid "Authentication method"
 msgstr "��旅����凌��凌溜侶��侶"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "��������亮留��侶"
 
@@ -4121,7 +4128,7 @@ msgstr "��侶亮旅凌����粒溜留 Message-ID"
 msgid "Add user-defined header"
 msgstr "����凌��慮流虜侶 虜竜��留了溜隆留�� 凌��旅��亮劉僚侶�� 留���� ��凌僚 ����流����侶"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr "����竜両竜��粒留��溜留..."
 
@@ -4588,499 +4595,504 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "����了凌��凌旅侶亮劉僚侶 ��旅僚竜龍旅虜流 (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "����了凌��凌旅侶亮劉僚侶 ��旅僚竜龍旅虜流 (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "��留��留隆凌��旅留虜流 ��旅僚竜龍旅虜流 (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "��留��留隆凌��旅留虜流 ��旅僚竜龍旅虜流 (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "��旅僚竜龍旅虜流 (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "��凌��竜留��旅虜流 (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr ""
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr ""
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr ""
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "里��了旅両侶 ����旅僚 ��侶僚 留��凌����凌了流"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "��旅留������旅��亮���� ����凌粒��留��流��"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "��������亮留��侶 竜旅��留粒��粒流"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "��������亮留��侶 ����流��侶 竜両����竜��旅虜凌�� ����凌粒��略亮亮留��凌�� 竜��竜両竜��粒留��溜留��"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "里��了旅両侶 亮侶僚��亮略����僚 ����凌����"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "��留��留虜��流��竜��"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "里��了旅両侶 ��留��略慮竜��侶��"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 #, fuzzy
 msgid "Wrap on input"
 msgstr "��僚留隆溜��了����侶 粒��留亮亮�ﾎ�"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "里��了旅両侶 ����旅僚 ��侶僚 留��凌����凌了流"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "��������亮留��侶 竜��旅了凌粒流 了凌粒留��旅留��亮凌�� 粒旅留 ��旅�� 留��留僚��流��竜旅��"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "��留��略慮竜��侶 ��凌�� 亮侶僚��亮留��凌�� ����留僚 留��留僚��略��竜"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 #, fuzzy
 msgid "Reply button invokes mailing list reply"
 msgstr "/����略僚��侶��侶 ��竜 ��了凌����"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 #, fuzzy
 msgid "Reply format"
 msgstr "��凌����凌��凌溜侶��侶 侶亮竜��凌亮侶僚溜留��"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "裡流亮留 ��留��略慮竜��侶��"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 #, fuzzy
 msgid "Forward format"
 msgstr "����凌�ﾎ故系�侶"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " ��竜��旅粒��留��流 ����亮硫��了��僚"
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "����留亮亮留��凌��竜旅��略"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr ""
 "��竜��劉����留��竜 ��留 凌僚��亮留��留 ����僚 ��竜隆溜��僚 ��侶�� 竜��旅虜竜��留了溜隆留�� (�������� ��凌 `From:' ��竜 `������')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "��亮��略僚旅��侶 留��旅慮亮凌�� 留隆旅略硫留������僚 隆溜��了留 ����凌 ��僚凌亮留 ��凌�� 虜留��留了��粒凌��"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 #, fuzzy
 msgid "letters"
 msgstr "��旅留粒��留��流"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "����竜旅虜��僚旅��侶 ��竜��溜了侶��侶��"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "��亮��略僚旅��侶 ��凌�� ��留��留了流����侶 ����侶 ����流了侶 `����凌����凌了劉留' 留僚 凌 留��凌����凌了劉留�� 竜溜����竜 竜��竜溜��"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr ""
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "��凌����凌��凌溜侶��侶 侶亮竜��凌亮侶僚溜留��"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " ����旅��亮���� 竜亮��留僚旅龍��亮竜僚��僚 ����凌旅��竜溜��僚 ��竜��溜了侶��侶��... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "��僚竜��粒凌��凌溜侶��侶 ������亮留��旅��亮凌�� ����僚 亮侶僚��亮略����僚"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Display 2-byte alphabet and numeric with 1-byte character"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "��亮��略僚旅��侶 ��亮流亮留��凌�� 亮竜 ��侶僚 虜竜��留了溜隆留 ��略僚�� 留���� ��侶僚 ����凌硫凌了流 亮侶僚��亮留��凌��"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "��亮��略僚旅��侶 硫��留��竜溜留�� 虜竜��留了溜隆留�� ����侶僚 留��竜旅虜��僚旅��侶 亮侶僚��亮留��凌��"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "��旅略����侶亮留 粒��留亮亮�ﾎ�"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "����了旅��侶"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "��旅��流 ��竜了溜隆留"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "��亮留了流 虜��了旅��侶"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "��留��略 硫流亮留��留"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "����旅��亮���� 竜亮��略僚旅��侶�� 虜竜��留了溜隆留��"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "��������亮留��凌�� 劉了竜粒��凌�� ����凌粒��留���ﾎ�"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "��亮��略僚旅��侶 ��凌�� 留��凌��竜了劉��亮留��凌�� ��凌�� 竜了劉粒��凌�� ��竜 両竜������旅������ ��留��略慮����凌"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr ""
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 #, fuzzy
 msgid "Expired after"
 msgstr ""
 "����凌����凌了流\n"
 "留��粒����竜��留"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 #, fuzzy
 msgid "minute(s) "
 msgstr "了竜����略"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Grab input while entering a passphrase"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "��亮��略僚旅��侶 竜旅隆凌��凌溜侶��侶�� 虜留��略 ��侶僚 竜虜虜溜僚侶��侶 留僚 ��凌 GnuPG 隆竜僚 了竜旅��凌����粒竜溜"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "劉僚留 亮流僚��亮留 隆竜僚 慮留 ��留��留了侶��慮竜溜\n"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr ""
 "��僚凌旅粒亮留 ��凌�� �����ﾏ�凌�� 留隆旅略硫留����凌�� 亮侶僚��亮留��凌�� 虜留��略 ��侶 亮竜��留虜溜僚侶��侶 ��竜 劉僚留 虜留��略了凌粒凌"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 #, fuzzy
 msgid "Only mark message as read when opened in new window"
 msgstr "/��流僚��亮留/��僚凌旅粒亮留 ��竜 僚劉凌 ��留��略慮����凌"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "��竜��留虜溜僚侶��侶 ����凌僚 虜留��略了凌粒凌 竜旅��竜����凌亮劉僚��僚 亮竜��略 ��侶 了流��侶 僚劉��僚 亮侶僚��亮略����僚"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "��������亮留��侶 竜虜��劉了竜��侶 粒旅留 ��侶 亮竜��留��凌��略 虜留旅 隆旅留粒��留��流 亮侶僚��亮略����僚"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(里留 亮侶僚��亮留��留 留��了略 慮留 ��侶亮留僚慮凌��僚 亮劉����旅 ��侶僚 竜虜��劉了竜��侶\n"
 "留僚 留������ 竜溜僚留旅 留��竜��旅了竜粒亮劉僚凌)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 #, fuzzy
 msgid "Receive dialog"
 msgstr "��亮��略僚旅��侶 隆旅留了��粒凌�� 了流��侶��"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "��亮��略僚旅��侶 隆旅留了��粒凌�� 了流��侶��"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "��略僚��留"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "��凌��劉"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr ""
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 #, fuzzy
 msgid "Close receive dialog when finished"
 msgstr "��亮��略僚旅��侶 隆旅留了��粒凌�� 了流��侶��"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr ""
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, fuzzy, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr ""
 "��両����竜��旅虜�� ������粒��留亮亮留 ����僚慮竜��侶�� (��凌 %s 慮留 留僚��旅虜留��留����留慮竜溜 亮竜 ��凌 ��僚凌亮留 留����竜溜凌��)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "����凌��慮流虜侶 隆旅竜��慮��僚��侶�� ����凌僚 ����凌凌��旅��亮�� ��竜 隆旅��了�� 虜了旅虜"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "��留��略 ��侶僚 劉両凌隆凌"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "����旅硫竜硫留溜����侶 竜両��隆凌��"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "��隆竜旅留��亮留 ����僚 隆旅留粒��留亮亮劉僚��僚 ����侶僚 劉両凌隆凌"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "����旅硫竜硫留溜����侶 ����旅僚 ��凌 略隆竜旅留��亮留"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "����凌竜旅隆凌��凌溜侶��侶 留僚 ����略����凌��僚 亮侶僚��亮留��留 ����侶僚 凌����略"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "侶 ����僚��凌亮凌粒��留��溜留 侶亮劉��留�� ��侶�� 竜硫隆凌亮略隆留��"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "��凌 ��了流��竜�� ��僚凌亮留 ��侶�� 亮劉��留�� ��侶�� 竜硫隆凌亮略隆留��"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "侶 ����僚��凌亮凌粒��留��溜留 ��凌�� 亮流僚留"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "��凌 ��了流��竜�� ��僚凌亮留 ��凌�� 亮流僚留"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "侶 ����凌��旅亮�ﾎ捨砧塾� 侶亮竜��凌亮侶僚溜留 虜留旅 �ﾏ�留 粒旅留 ��凌 ����劉��凌僚 locale"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "凌 留��旅慮亮���� 留旅�ﾎ塾� (劉��侶 / 100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "侶 亮劉��留 ��凌�� 亮流僚留 ���� 隆竜虜留隆旅虜���� 留��旅慮亮����"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "侶 �ﾏ�留 ���� 隆竜虜留隆旅虜���� 留��旅慮亮���� ����侶��旅亮凌��凌旅�ﾎ熟�留�� 24����凌 ��凌了��旅"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "侶 �ﾏ�留 ���� 隆竜虜留隆旅虜���� 留��旅慮亮���� ����侶��旅亮凌��凌旅�ﾎ熟�留�� 12����凌 ��凌了��旅"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "侶 亮劉��留 ��凌�� 劉��凌���� ���� 隆竜虜留隆旅虜���� 留��旅慮亮����"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "凌 亮流僚留�� ���� 隆竜虜留隆旅虜���� 留��旅慮亮����"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "��凌 了竜������ ���� 隆竜虜留隆旅虜���� 留��旅慮亮����"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "竜溜��竜 ���� 流 ����"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "��凌 隆竜����竜����了竜����凌 ���� 隆竜虜留隆旅虜���� 留��旅慮亮����"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "侶 亮劉��留 ��侶�� 竜硫隆凌亮略隆留�� ���� 隆竜虜留隆旅虜���� 留��旅慮亮����"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "侶 ����凌��旅亮�ﾎ捨砧塾� 侶亮竜��凌亮侶僚溜留 粒旅留 ��凌 ����劉��凌僚 locale"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "��留 ��竜了竜����留溜留 隆��凌 ��侶��溜留 ��凌�� 劉��凌����"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "��凌 劉��凌�� ���� 隆竜虜留隆旅虜���� 留��旅慮亮����"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "�� 龍�ﾎ塾� �ﾏ�留�� 流 ��僚凌亮留, 流 ����僚亮��凌亮凌粒��留��溜留"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "����凌��隆旅凌��旅����流��"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "��竜��旅粒��留��流"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "��留��略隆竜旅粒亮留"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "����旅��亮凌�� ������亮略����僚 亮侶僚��亮留��凌��"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "律���ﾎ捨穎�留"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "��留��留��旅慮劉亮竜僚凌 虜竜溜亮竜僚凌 - �����ﾏ�凌 竜��溜��竜隆凌"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "��留��留��旅慮劉亮竜僚凌 虜竜溜亮竜僚凌 - ��竜����竜��凌 竜��溜��竜隆凌"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "��留��留��旅慮劉亮竜僚凌 虜竜溜亮竜僚凌 - 里��溜��凌 竜��溜��竜隆凌"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "裡��僚隆竜��亮凌�� URI"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "��僚留虜��虜了����侶 ������亮略����僚 ��留��略慮竜��侶��"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "����旅了凌粒流 �����ﾎ捨穎�凌�� �����ﾏ�凌�� 竜��旅��劉隆凌�� ��留��略慮竜��侶��"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "����旅了凌粒流 �����ﾎ捨穎�凌�� 隆竜����竜��凌�� 竜��旅��劉隆凌�� ��留��略慮竜��侶��"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "����旅了凌粒流 �����ﾎ捨穎�凌�� ����溜��凌�� 竜��旅��劉隆凌�� ��留��略慮竜��侶��"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "����旅了凌粒流 �����ﾎ捨穎�凌�� 粒旅留 URI"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "��竜��旅粒��留��流 ����僚 ����亮硫��了��僚"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 #, fuzzy
 msgid ""
 "Date\n"
@@ -5105,11 +5117,11 @@ msgstr ""
 "Message-ID\n"
 "%"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5118,7 +5130,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5126,28 +5138,28 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "����旅了凌粒流 粒��留亮亮留��凌��竜旅��略��"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 #, fuzzy
 msgid "Key bindings"
 msgstr "裡��劉了僚��"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 #, fuzzy
 msgid "Default"
 msgstr "����凌虜留慮凌��旅��亮劉僚凌 虜了竜旅隆溜 ����凌粒��留��流��"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr ""
 
@@ -5215,213 +5227,208 @@ msgstr "痢��慮亮溜��竜旅�� ��溜了������僚"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "��劉了竜��竜 ����略粒亮留��旅 僚留 隆旅留粒��留��竜溜 留�������� 凌 虜留僚��僚留��;"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "律����溜�� ��溜��了凌"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "��旅留粒��留��流 虜留僚��僚留"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "��旅留粒��留��流 虜留僚��僚留"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "��了竜�� 凌旅 虜竜��留了溜隆竜��"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "����旅虜竜��留了溜隆留"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "��流僚��亮留"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "��竜��旅劉��竜旅"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "隆竜僚 ��竜��旅劉��竜旅"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "��竜��留虜溜僚侶��侶 ��略����"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/��僚��旅粒��留��流..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "��侶僚 ��留��留了略硫竜旅��"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "��旅留粒��留��流 news server"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "裡����了旅留"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "����旅��亮凌�� ������亮略����僚 亮侶僚��亮留��凌��"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/裡流亮留僚��侶/裡流亮留僚��侶 ���� 隆旅留硫留��亮劉僚凌"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/����凌�ﾎ故系�侶 ���� ����凌��略����侶��侶"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/����留僚-竜��竜両竜��粒留��溜留"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "��虜��劉了竜��侶"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "��留��略了凌粒凌��"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "��旅竜��慮��僚��侶"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "����旅虜竜��留了溜隆留"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "����旅虜竜��留了溜隆留"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "����旅虜竜��留了溜隆留"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "�� ��留��留了流����侶�� 隆竜僚 劉��竜旅 凌��旅����竜溜."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "里凌 ��僚凌亮留 ��侶�� 虜竜��留了溜隆留�� 隆竜僚 劉��竜旅 凌��旅����竜溜."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "�� ����凌凌��旅��亮���� 隆竜僚 劉��竜旅 凌��旅����竜溜."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "里凌 ��僚凌亮留 ��侶�� 虜竜��留了溜隆留�� 隆竜僚 劉��竜旅 凌��旅����竜溜."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: ��凌 留����竜溜凌 隆竜僚 ����略����竜旅\n"
@@ -5690,60 +5697,60 @@ msgstr "裡��僚隆劉凌亮留旅"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "裡��僚隆竜��侶 ����侶僚 竜両����侶��劉��侶 SMTP: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "裡��劉了僚�� MAIL FROM..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 #, fuzzy
 msgid "Authenticating"
 msgstr "��旅����凌��凌溜侶��侶"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 #, fuzzy
 msgid "Sending message..."
 msgstr "����凌����凌了流 亮侶僚��亮留��凌��"
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "裡��劉了僚�� MAIL FROM..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "裡��劉了僚�� MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "裡��劉了僚��"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "裡��劉了僚�� RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "裡��劉了僚�� DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "��粒虜留��留了竜溜����..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "裡��劉了僚�� ��凌 亮流僚��亮留 (%d / %d bytes)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "����凌����凌了流 亮侶僚��亮留��凌��"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "裡��僚劉硫侶 ����略了亮留 虜留��略 ��侶僚 留��凌����凌了流 ��凌�� 亮侶僚��亮留��凌��."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6059,125 +6066,125 @@ msgstr "����."
 msgid "Creating summary view...\n"
 msgstr "��侶亮旅凌����粒溜留 留��竜旅虜��僚旅��侶�� ��竜��溜了侶��侶��...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr ""
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "��竜��旅虜劉�� ��侶亮略僚��竜旅�� 劉��凌��僚 留��凌亮竜溜僚竜旅. ��留 竜��竜両竜��粒留����凌��僚;"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "裡略������侶 虜留��留了��粒凌�� (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "��竜僚 ����略����凌��僚 留隆旅略硫留����留 亮侶僚��亮留��留"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "��竜僚 硫��劉慮侶虜留僚 留隆旅略硫留����留 亮侶僚��亮留��留. ��留 ��略両�� 留���� ��凌 ��劉了凌��;"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "��竜僚 ����略����凌��僚 留隆旅略硫留����留 亮侶僚��亮留��留"
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "��竜僚 硫��劉慮侶虜留僚 留隆旅略硫留����留 亮侶僚��亮留��留. ��留 ��略�� ����凌僚 竜����亮竜僚凌 虜留��略了凌粒凌;"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 #, fuzzy
 msgid "Search again"
 msgstr "�� 留僚留龍流��侶��侶 留��劉������竜"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 #, fuzzy
 msgid "No more new messages"
 msgstr "��竜僚 ����略����凌��僚 留隆旅略硫留����留 亮侶僚��亮留��留"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "��竜僚 硫��劉慮侶虜留僚 留隆旅略硫留����留 亮侶僚��亮留��留. ��留 ��略両�� 留���� ��凌 ��劉了凌��;"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 #, fuzzy
 msgid "No new messages."
 msgstr "��竜僚 ����略����凌��僚 留隆旅略硫留����留 亮侶僚��亮留��留"
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr "��竜僚 硫��劉慮侶虜留僚 留隆旅略硫留����留 亮侶僚��亮留��留. ��留 ��略�� ����凌僚 竜����亮竜僚凌 虜留��略了凌粒凌;"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "��竜僚 ����略����凌��僚 略了了留 ��侶亮竜旅��亮劉僚留 亮侶僚��亮留��留"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "��竜僚 硫��劉慮侶虜留僚 ��侶亮竜旅��亮劉僚留 亮侶僚��亮留��留. ��留 ��略両�� 留���� ��凌 ��劉了凌��;"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "��竜僚 ����略����凌��僚 ��侶亮竜旅��亮劉僚留 亮侶僚��亮留��留."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "��竜僚 硫��劉慮侶虜留僚 ��侶亮竜旅��亮劉僚留 亮侶僚��亮留��留. ��留 ��略両�� 留���� ��侶僚 留����流;"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "��竜僚 ����略����凌��僚 略了了留 亮侶僚��亮留��留 亮竜 竜��旅虜劉��竜��"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "��竜僚 硫��劉慮侶虜留僚 亮侶僚��亮留��留 亮竜 竜��旅虜劉��竜��. ��留 ��略両�� 留���� ��凌 ��劉了凌��;"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "��竜僚 ����略����凌��僚 亮侶僚��亮留��留 亮竜 竜��旅虜劉��竜��."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "��竜僚 硫��劉慮侶虜留僚 亮侶僚��亮留��留 亮竜 竜��旅虜劉��竜��. ��留 ��略両�� 留���� ��侶僚 留����流;"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d 隆旅留粒��略��侶虜留僚"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 亮竜��留虜旅僚流慮侶虜留僚"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 留僚��旅粒��略��侶虜留僚"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " 亮流僚��亮留(��留) 竜��旅了劉��慮侶虜竜(留僚)"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 僚劉留, %d 留隆旅略硫留����留, %d ����僚凌了旅虜略 (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 僚劉留, %d 留隆旅略硫留����留, %d ����僚凌了旅虜略"
@@ -6351,6 +6358,10 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "留��劉������竜 ��凌 粒��略��旅亮凌 ����凌 %s.\n"
 
+#, fuzzy
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "裡略������侶 虜留��留了��粒凌�� %s ..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌/---"
 
diff --git a/po/es.po b/po/es.po
index ca8898d8..c4f321e5 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: 2004-12-21 11:18+0100\n"
 "Last-Translator: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
 "Language-Team: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
@@ -64,11 +64,11 @@ msgstr ""
 "junto con este programa; en caso contrario, escriba a la Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Leyendo configuraci坦n de cada cuenta...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -76,19 +76,19 @@ msgstr ""
 "Hay ventanas de composici坦n abiertas.\n"
 "Cierre todas las ventanas de composici坦n antes de editar las cuentas."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Abriendo ventana de edici坦n de cuenta...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Creando ventana de edici坦n de cuenta...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Editar cuentas"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -96,8 +96,8 @@ msgstr ""
 "El orden de comprobaci坦n de mensajes ser叩 辿ste. Marque las casillas\n"
 "en la columna `G' para habilitar la descarga mediante `Traer todo'."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -105,60 +105,66 @@ msgstr ""
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Servidor"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "A単adir"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Editar"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " Borrar "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Abajo"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Arriba"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " Establecer como cuenta por omisi坦n "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "多Esta seguro de que quiere borrar esta cuenta?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Sin t鱈tulo"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Borrar cuenta"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "多Esta seguro de que quiere borrar esta cuenta?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Si"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+No"
 
@@ -227,7 +233,7 @@ msgstr " Enviar "
 msgid "Abort"
 msgstr "Abortar"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -238,11 +244,11 @@ msgstr ""
 "(`%%h' ser叩 sustituido por el par叩metro)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "Par叩metro de usuario (oculto) de la acci坦n"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -253,7 +259,7 @@ msgstr ""
 "(`%%u' ser叩 sustituido con el par叩metro)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "Par叩metro de usuario de la acci坦n"
 
@@ -261,7 +267,7 @@ msgstr "Par叩metro de usuario de la acci坦n"
 msgid "Add Address to Book"
 msgstr "A単adir direcci坦n a la agenda"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Direcci坦n"
@@ -347,8 +353,8 @@ msgstr "/_Direcci坦n/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Direcci坦n/_Borrar"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
@@ -356,13 +362,13 @@ msgstr "/_Herramientas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
@@ -379,10 +385,10 @@ msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -401,17 +407,17 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Direcci坦n e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Nombre:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -581,7 +587,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -605,7 +611,7 @@ msgstr "Direcci坦n com炭n"
 msgid "Personal address"
 msgstr "Direcci坦n personal"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Notificaci坦n"
 
@@ -613,7 +619,7 @@ msgstr "Notificaci坦n"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Error"
 
@@ -625,31 +631,31 @@ msgstr "Creando el di叩logo de alerta...\n"
 msgid "Show this message next time"
 msgstr "Mostrar este mensaje de nuevo"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Naranja"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "Rojo"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Azul cielo"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Azul"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Verde"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Marr坦n"
 
@@ -657,7 +663,7 @@ msgstr "Marr坦n"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Ninguno"
 
@@ -669,8 +675,8 @@ msgstr "/_A単adir"
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -830,8 +836,8 @@ msgstr "/_Ver/_Responder a"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
@@ -858,7 +864,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -941,137 +947,142 @@ msgstr "/_Ver/_Conjunto de c坦digos/Chino simplificado (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_Ver/_Conjunto de c坦digos/Chino simplificado (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Conjunto de c坦digos/Chino tradicional (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/_Conjunto de c坦digos/Chino tradicional (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/_Conjunto de c坦digos/Coreano (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/_Conjunto de c坦digos/Tailand辿s (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/_Conjunto de c坦digos/Tailand辿s (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con el editor e_xterno"
 
-#: src/compose.c:674
+#: src/compose.c:676
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Herramientas/Fir_mar con PGP"
 
-#: src/compose.c:675
+#: src/compose.c:677
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaje/_Encriptar con PGP"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "No se puede obtener la parte de texto\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "No se puede obtener el tama単o de %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vac鱈o."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Componer mensaje%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "No se especific坦 el destinatario."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vac鱈o. 多Enviar de todas formas?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1079,28 +1090,28 @@ msgstr ""
 "No especific坦 ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "No se encontr坦 ninguna clave asociada al ID-clave seleccionado actualmente `%"
 "s'."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1110,140 +1121,140 @@ msgstr ""
 "de %s a %s.\n"
 "多Enviarlo de todas formas?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "no se pueden escribir las cabeceras\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composici坦n...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Tama単o"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Enviar despu辿s"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar despu辿s"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Insertar fichero"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Insertar firma"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Cortar todas las l鱈neas largas"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inv叩lido."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o est叩 vac鱈o."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Codificaci坦n"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "La orden del editor externo es inv叩lida: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1254,72 +1265,72 @@ msgstr ""
 "多Desea terminar el proceso?\n"
 "Id. de grupo de proceso: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado grupo de proceso id.: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fichero temporal: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Componer: entrada desde proceso monitor\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "No se pudo ejecutar el editor externo\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "No se pudo escribir en el fichero\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Fallo leyendo tuber鱈a\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Descartar mensaje"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Este mensaje se ha modificado. 多Desea descartarlo?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "a Borradores"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "多Quiere aplicar la plantilla `%s' ?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Reemplazar"
 
@@ -1480,12 +1491,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -1655,160 +1666,156 @@ msgstr "fallo escribiendo la configuraci坦n a fichero\n"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' no puede estar en el nombre de la carpeta."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta `%s' ya existe."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta `%s'."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/Crear _nueva carpeta..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/_Renombrar carpeta..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 msgid "/Empty _trash"
 msgstr "/_Vaciar papelera"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hay mensajes nuevos"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir 叩rbol de carpetas"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/_Buscar en los mensajes"
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 msgid "/Down_load"
 msgstr "/Des_cargar"
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Nuevos"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "No le鱈dos"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "N尊"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Estableciendo informaci坦n de carpeta...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Estableciendo informaci坦n de carpeta..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "Reconstruir 叩rbol de carpetas"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Se reconstruir叩 el 叩rbol de carpetas. 多Continuar?"
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo el 叩rbol de carpetas..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstrucci坦n del 叩rbol de carpetas fall坦."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Reconstruyendo todos los 叩rboles de carpetas..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descargando mensajes en %s ..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hubo un error descargando los mensajes en `%s'."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1818,16 +1825,16 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " a単ada `/' al final del nombre)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para `%s':"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1836,24 +1843,24 @@ msgstr ""
 "Todas las carpetas y mensajes bajo `%s' ser叩n borrados.\n"
 "多Confirma el borrado?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "No se puede eliminar la carpeta `%s'."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "多Vaciar todos los mensajes de la papelera?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1862,34 +1869,34 @@ msgstr ""
 "多Realmente desea eliminar el buz坦n `%s' ?\n"
 "(Los mensajes NO se borrar叩n del disco)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "多Eliminar realmente la cuenta IMAP4 `%s'?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "多Borrar el grupo de noticias `%s'?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "多Borrar la cuenta de noticias `%s'?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
@@ -1937,7 +1944,7 @@ msgstr "desconocido"
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Hecho."
 
@@ -2220,7 +2227,7 @@ msgstr "Importar fichero LDIF a la agenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2310,7 +2317,7 @@ msgstr "Conectando al servidor POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servirdor POP3: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
@@ -2340,7 +2347,7 @@ msgstr "Obteniendo el tama単o de nuevos mensajes (LIST)..."
 msgid "Deleting message %d"
 msgstr "Borrando mensaje %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Saliendo"
 
@@ -2383,7 +2390,8 @@ msgstr "No se puede escribir el fichero."
 msgid "Socket error."
 msgstr "Error de socket."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "Conexi坦n cerrada por la m叩quina remota."
 
@@ -2400,11 +2408,11 @@ msgstr ""
 "El buz坦n est叩 bloqueado:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "La autentificaci坦n fall坦."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2413,7 +2421,7 @@ msgstr ""
 "La autentificaci坦n fall坦:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr "Se agot坦 el tiempo de espera de la sesi坦n."
 
@@ -2826,320 +2834,320 @@ msgstr "/_Ver/_Conjunto de c坦digos/Japon辿s (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Conjunto de c坦digos/Japon辿s (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Conjunto de c坦digos/Chino (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Conjunto de c坦digos/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en una ventana _nueva"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_Ver/Mostrar todas las cabeceras"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_Mensaje"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaje/Reci_bir"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaje/Reci_bir/De la cuenta a_ctual"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaje/Reci_bir/De tod_as las cuentas"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensaje/Reci_bir/Ca_ncelar recepci坦n"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaje/Reci_bir/---"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaje/Enviar mensa_jes en cola"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaje/Componer _nuevo mensaje"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_Mensaje/_Responder"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaje/Respon_der a"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaje/Respon_der a/A _todos"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaje/Respon_der a/Al _remitente"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaje/Respon_der a/A la _lista de correo"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/_Mensaje/_Reenviar"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaje/Reen_viar como adjunto"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaje/Red_irigir"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaje/M_over..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaje/_Copiar..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_Mensaje/_Borrar"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_Mensaje/_Marcar"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaje/_Marcar/_Marcar"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaje/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaje/_Marcar/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaje/_Marcar/Marcar como no le鱈do"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaje/_Marcar/Marcar como le鱈do"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaje/_Marcar/Marcar todo como le鱈do"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaje/Re_editar"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Herramientas/A単adir _remitente a la agenda"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Herramientas/_Filtrar todos los mensajes de la carpeta"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Herramientas/_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Autom叩ticamente"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Herramientas/Borrar los mensajes re_petidos"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_Herramientas/E_jecutar"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/_Herramientas/_Ventana de traza"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Configuraci坦n"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuraci坦n/Preferencias _comunes..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuraci坦n/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuraci坦n/_Plantillas ..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuraci坦n/_Acciones..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Configuraci坦n/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuraci坦n/_Preferencias de la cuenta actual..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuraci坦n/Crear _nueva cuenta..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuraci坦n/_Editar cuentas..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuraci坦n/_Cambiar cuenta actual"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_Ayuda/_Manual"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ayuda/_Manual/_Ingl辿s"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ayuda/_Manual/_Japon辿s"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/_Ayuda/_FAQ"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ayuda/_FAQ/_Ingl辿s"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ayuda/_FAQ/_Alem叩n"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ayuda/_FAQ/_Espa単ol"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ayuda/_FAQ/_Franc辿s"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ayuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_Ayuda/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Creando ventana principal...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Sin t鱈tulo"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambiando el tipo de separaci坦n de ventana de %d a %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr "Esta desconectado. 多Conectar?"
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 msgid "Empty all trash"
 msgstr "Vaciar todas las papeleras"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 msgid "Empty messages in all trash?"
 msgstr "多Vaciar los mensajes de todas las papeleras?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "A単adir buz坦n"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3149,16 +3157,16 @@ msgstr ""
 "Si el buz坦n especificado ya existe ser叩\n"
 "escaneado autom叩ticamente."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buz坦n `%s' ya existe."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3168,141 +3176,141 @@ msgstr ""
 "Quiz叩s ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - ��rbol de carpetas"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 msgid "/Reply to _all"
 msgstr "/Responder a _todos"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 msgid "/Reply to _sender"
 msgstr "/Responder al _remitente"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Incorporar correo nuevo"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo nuevo de todas las cuentas"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Enviar mensaje(s) en la cola"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Componer"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Componer mensaje nuevo"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Responder al mensaje"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Responder a todos"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Reenviar el mensaje"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Borrar el mensaje"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Ejecutar el proceso marcado"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "Siguiente no le鱈do"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "Preferencias comunes"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Preferencias de la cuenta"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga click en el icono para conectar."
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga click en el icono para desconectar."
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "多Salir del programa?"
 
@@ -3424,28 +3432,28 @@ msgstr "Se lleg坦 al final del mensaje. 多Seguir desde el principio?"
 msgid "Search finished"
 msgstr "B炭squeda concluida"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Creando visor de mensaje...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3454,7 +3462,7 @@ msgstr ""
 "Teclee la orden para imprimir:\n"
 "(`%s' ser叩 sustituido por el fichero)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3894,7 +3902,7 @@ msgstr "Descargar todos los mensajes del servidor"
 msgid "Receive size limit"
 msgstr "Tama単o l鱈mite para recibir"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "Kb"
 
@@ -3914,7 +3922,7 @@ msgstr "(Los mensajes sin filtrar se guardar叩n en esta carpeta)"
 msgid "Authentication method"
 msgstr "M辿todo de autentificaci坦n"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Autom叩tica"
 
@@ -3938,7 +3946,7 @@ msgstr "Generar ID-Mensaje"
 msgid "Add user-defined header"
 msgstr "A単adir cabecera de usuario"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4411,30 +4419,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Chino simplificado (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Chino simplificado (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Chino tradicional (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chino tradicional (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chino (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Tailand辿s (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Tailand辿s (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4443,11 +4456,11 @@ msgstr ""
 "Si se selecciona `Autom叩tico' se utilizar叩 la\n"
 "codificaci坦n 坦ptima para la localizaci坦n actual."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "Codificaci坦n de transferencia"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4456,118 +4469,118 @@ msgstr ""
 "Especificar la codificaci坦n de transferencia (Content-Transfer-Encoding)\n"
 "cuando el cuerpo del mensaje contiene caracteres no-ASCII."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Separador de firma"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Insertar autom叩ticamente"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Lanzar el editor externo autom叩ticamente"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "Niveles de deshacer"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Recortar mensajes a los"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Recortar citaci坦n"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Recortar al escribir"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Recortar antes de enviar"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "Seleccionar autom叩ticamente la cuenta para responder"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Citar el mensaje al responder"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "El bot坦n Responder invoca responder a la lista de correo"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Formato de r辿plica"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Marca de citaci坦n"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Formato de reenvio"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Descripci坦n de s鱈mbolos "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Fuente"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traducir cabeceras (como `Desde:', `Asunto:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Ver el n炭mero de no le鱈dos junto al nombre de la carpeta"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar nombres de grupos con m叩s de"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Vista resumen"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Ver destinatario en la columna `Desde' si el remitente es usted mismo"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Expandir hilos"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Formato de fecha"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " Elementos visibles en cabecera... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Permitir colores en el mensaje"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4575,327 +4588,327 @@ msgstr ""
 "Mostrar alfab辿ticos y num辿ricos multi-byte como\n"
 "caracteres ASCII (s坦lo para Japon辿s)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceras sobre el mensaje"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Cabeceras breves en la vista del mensaje"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Interlineado"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Desplazamiento"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Media p叩gina"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Paso"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar las im叩genes adjuntas para adecuarlas a la ventana"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Ver propiedades de cabeceras"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Comprobar las firmas autom叩ticamente"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Mostrar di叩logo de comprobaci坦n de firma"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Mantener contrase単a en memoria temporalmente"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Expirar despu辿s de"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "minuto(s) "
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Poniendo '0' mantendr叩 la contrase単a\n"
 " durante toda la sesi坦n)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar la entrada mientras se introducen contrase単as"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar aviso al arrancar si no funciona GnuPG"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "Abrir siempre los mensajes del resumen al seleccionarlos"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Abrir el primer mensaje no le鱈do al abrir una carpeta"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "Marcar mensaje como le鱈do s坦lo al abrirlo en una ventana nueva"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "Abrir entrada despues de recibir correo nuevo"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Los mensajes se marcar叩n hasta la ejecuci坦n\n"
 " si est叩 desactivado)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Di叩logo de recepci坦n"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Mostrar di叩logo de recepci坦n"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Siempre"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr "S坦lo al recibir manualmente"
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "No mostrar di叩logo de error si hay errores de recepci坦n"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Mostrar di叩logo de recepci坦n al finalizar"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " Establecer atajos de teclado... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "��rdenes externas (%s se sustituir叩 con el nombre de fichero / URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "A単adir direcci坦n al destino con doble click"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "Al salir"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Confirmar al salir"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "Vaciar papelera al salir"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Preguntar antes de vaciar"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensajes en cola"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "Tiempo de espera agotado E/S socket:"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "segundo(s)"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "el dia de la semana abreviado"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "el dia de la semana completo"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "el nombre del mes completo"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "la fecha y hora preferida para la localizaci坦n actual"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "el n炭mero de siglo (a単o/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "el dia del mes como n炭mero decimal"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora como n炭mero usando el reloj de 24 horas"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora como n炭mero usando el reloj de 12 horas"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "el dia del a単o como n炭mero decimal"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "el mes como n炭mero decimal"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "el minuto como n炭mero decimal"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "el segundo como n炭mero decimal"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "el dia de la semana como n炭mero decimal"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localizaci坦n actual"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "los dos 炭ltimos d鱈gitos del a単o"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "el a単o como n炭mero decimal"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Descripci坦n"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "Ejemplo"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Colores del mensaje"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Colores"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Reutilizar colores de citaci坦n"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "Elejir color para el nivel de citado 1"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "Elejir color para el nivel de citado 2"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "Elejir color para el nivel de citado 3"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "Elejir color para URIs"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Descripci坦n de s鱈mbolos"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4919,11 +4932,11 @@ msgstr ""
 "Grupos de noticias\n"
 "ID-Mensaje"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Si x est叩, muestra expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4937,7 +4950,7 @@ msgstr ""
 "Cuerpo del mensaje citado sin firma\n"
 "El car叩cter %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4949,15 +4962,15 @@ msgstr ""
 "Car叩cter llave abierta\n"
 "Car叩cter llave cerrada"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Selecci坦n de tipograf鱈a"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Atajos de teclado"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4967,11 +4980,11 @@ msgstr ""
 "Se pueden modificar tambi辿n los atajos de los men炭s pulsando\n"
 "cualquier tecla(s) al situar el rat坦n sobre el elemento del men炭."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "Por defecto"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Antiguos de Sylpheed"
 
@@ -5039,190 +5052,185 @@ msgstr "Preferencias de filtrado"
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "多Est叩 seguro de que quiere borrar esta regla?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Sin t鱈tulo"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Borrar regla"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 msgid "Filter rule"
 msgstr "Regla de filtrado"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr "Si coincide alguna de las condiciones siguientes"
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr "Si coinciden todas las condiciones siguientes"
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr "Realizar las acciones siguientes:"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr "Para o Cc"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 msgid "Any header"
 msgstr "Cualquier cabecera"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 msgid "Edit header..."
 msgstr "Editar cabecera..."
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 msgid "Message body"
 msgstr "Cuerpo del mensaje"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr "Resultado de una orden"
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr "Edad"
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "contiene"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 msgid "doesn't contain"
 msgstr "no contiene"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr "es"
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr "no es"
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr "coincide con exp.reg."
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr "no coincide con exp.reg."
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr "es mayor que"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr "es menor que"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr "es m叩s largo que"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr "es m叩s corto que"
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Mover a"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 msgid "Copy to"
 msgstr "Copiar a"
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "No recibir"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 msgid "Delete from server"
 msgstr "Borrar del servidor"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 msgid "Set mark"
 msgstr "Establecer marca"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 msgid "Set color"
 msgstr "Establecer color"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 msgid "Mark as read"
 msgstr "Marcar como le鱈do"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 msgid "Forward as attachment"
 msgstr "Reenviar como adjunto"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 msgid "Redirect"
 msgstr "Redirigir"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 msgid "Execute command"
 msgstr "Ejecutar orden"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr "Detener la evaluaci坦n de reglas"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 msgid "folder:"
 msgstr "carpeta:"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 msgid "address:"
 msgstr "direcci坦n:"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 msgid "Edit header list"
 msgstr "Editar lista de cabeceras"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 msgid "Headers"
 msgstr "Cabeceras"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 msgid "Header:"
 msgstr "Cabecera:"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 msgid "Rule name is not specified."
 msgstr "No se especific坦 el nombre de la regla."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 msgid "Command is not specified."
 msgstr "No se especific坦 la orden."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr "Existe una condici坦n inv叩lida."
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 msgid "Destination folder is not specified."
 msgstr "No se especific坦 la carpeta de destino."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr "Existe una orden inv叩lida."
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 msgid "Condition not exist."
 msgstr "No existe la condici坦n."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 msgid "Action not exist."
 msgstr "No existe la acci坦n."
 
@@ -5477,56 +5485,56 @@ msgstr "Conectando"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando con el servidor SMTP: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "Autentificando"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "Enviando mensaje..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Terminando..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensaje (%d / %d bytes)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "Hubo un error enviando el mensaje."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5833,120 +5841,120 @@ msgstr "No."
 msgid "Creating summary view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Queda alguna marca. 多Procesarla?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "No hay m叩s mensajes sin leer"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. 多Buscar desde el final?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. 多Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "B炭scar de nuevo"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "No hay m叩s mensajes nuevos"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "No hay m叩s mensajes nuevos. 多Buscar desde el final?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "No hay m叩s mensajes nuevos. 多Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "No hay m叩s mensajes marcados"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. 多Buscar desde el final?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "No hay mensajes marcados. 多Buscar desde el principio?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "No hay m叩s mensajes etiquetados"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. 多Buscar desde el final?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. 多Buscar desde el principio?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por asunto..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevos, %d no le鱈dos, %d totales (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuevos, %d no le鱈dos, %d totales"
@@ -6118,6 +6126,9 @@ msgstr "%.2fGb"
 msgid "writing to %s failed.\n"
 msgstr "fallo escribiendo en %s.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Reconstruyendo todos los 叩rboles de carpetas..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_Ver/_Conjunto de c坦digos/---"
 
diff --git a/po/et.po b/po/et.po
index 2aef7854..e7482f0c 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+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"
@@ -62,11 +62,11 @@ msgstr ""
 "programmiga; kui ei, siis kirjuta: Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Loen k探igi kontode seaded...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -74,19 +74,19 @@ msgstr ""
 "M探ned kirjutusaknad on avatud.\n"
 "Palun sulge k探ik kirjutusaknad enne kontode redigeerimist."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Avan kontode redigeerimisakna...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Loon kontode redigeerimisakna...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Kontode redigeerimine"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -94,8 +94,8 @@ msgstr ""
 "*Uusi teateid v探etakse selles j辰rjekorras. M辰rgi kastikesed\n"
 "'G' tulbas lubamaks kirjade v探tmist kasutades 'V探ta k探ik'."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -103,60 +103,66 @@ msgstr ""
 msgid "Name"
 msgstr "Nimi"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Lisa"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Redigeeri"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " Kustuta "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Alla"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "��les"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " M辰辰ra vaikimisi kontoks "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Kas te t探esti soovite kustutada kontot?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Tiitlita"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Kustuta konto"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "Kas te t探esti soovite kustutada kontot?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Jah"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Ei"
 
@@ -225,7 +231,7 @@ msgstr " Saada "
 msgid "Abort"
 msgstr "Katkesta"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -235,11 +241,11 @@ msgstr ""
 "Sisesta tr端kkimise k辰surida:\n"
 "(%s asendatakse failinimega)"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -249,7 +255,7 @@ msgstr ""
 "Sisesta tr端kkimise k辰surida:\n"
 "(%s asendatakse failinimega)"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr ""
 
@@ -257,7 +263,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Aadress"
@@ -343,8 +349,8 @@ msgstr "/_Aadress/R_edigeeri"
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_T旦旦riist"
 
@@ -352,13 +358,13 @@ msgstr "/_T旦旦riist"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_T旦旦riist/Impordi _LDIF fail"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
 
@@ -375,10 +381,10 @@ msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -397,17 +403,17 @@ msgstr "/Kustuta"
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Nimi:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -576,7 +582,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Kaust"
 
@@ -600,7 +606,7 @@ msgstr "��ldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "M辰rkus"
 
@@ -608,7 +614,7 @@ msgstr "M辰rkus"
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Viga"
 
@@ -620,31 +626,31 @@ msgstr "*Loon alert paneeli dialoogi...\n"
 msgid "Show this message next time"
 msgstr "N辰ita seda teadet j辰rgmisel korral"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Oran転"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "Punane"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Roosa"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Taevasinine"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Sinine"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Roheline"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Pruun"
 
@@ -652,7 +658,7 @@ msgstr "Pruun"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Mittemiski"
 
@@ -664,8 +670,8 @@ msgstr "/Lis_a..."
 msgid "/_Remove"
 msgstr "/Eemalda"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Omadus..."
@@ -831,8 +837,8 @@ msgstr "/_Vaade/_Vasta"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_vaade/---"
 
@@ -859,7 +865,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -942,140 +948,145 @@ msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiine (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiina (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vaade/_Kooditabel/Tai (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vaade/_Kooditabel/Tai (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_T旦旦riist/_Aadressiraamat"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_T旦旦riist/_Mall"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_T旦旦riist/Tegevused"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_T旦旦riist/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/R_edaktor/Redi_geeri v辰lise redaktoriga"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_T旦旦riist/Tegevused"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Kiri/Kr端pteeri"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Ei saa tekstiosa k辰tte\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "*Tsitaadim辰rgi formaadi viga."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on t端hi."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa k辰tte."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [Redigeeritud]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Kirjuta kiri%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Saaja pole m辰辰ratud."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Saada"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "P辰辰lkiri on t端hi. Kas saadame igal juhul?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1083,27 +1094,27 @@ msgstr ""
 "Kirja saatmiseks pole m辰辰ratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei 探nnestunud asetada v辰ljunute kausta."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Ei suutnud leida 端htki v探tit, mis oleks seotud valitud v探tmega (id'%s')."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1112,141 +1123,141 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "Ei suuda kirjutada p辰ist\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "Asetan kirja j辰rjekorda...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "j辰rjekorra kausta ei leidunud\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja j辰rjekorda asetada\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME t端端p"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Saada kiri"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Hiljem"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "Pane j辰rjekorda ja saada hiljem"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Mustand"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Salvesta mustandite kausta"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Lisa"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Lisa fail"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Manusta"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Manusta fail"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Allkiri"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Lisa allkiri"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Redaktor"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Redigeeri v辰lise redaktoriga"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Rea辰辰r"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Murra k探ik pikad read"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Vale MIME t端端p."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri v探i on see t端hi."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "V辰lise redaktori k辰surida on vale: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1257,72 +1268,72 @@ msgstr ""
 "Kas h辰vitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "H辰vitatud protsessi grupi id: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ajutine fail: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Kirjutaja: sisend monitoorprotsessilt\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Ei suutnud v辰list redaktorit k辰ivitada\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Ei suutnud faili salvestada\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Torust lugemine eba探nnestus\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Kirja ei 探nnestunud j辰rjekorda asetada."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "M辰辰ra fail"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "M辰辰ra fail"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Kaota kiri"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Kaota"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "Mustanditesse"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Asenda"
 
@@ -1483,12 +1494,12 @@ msgstr "Redigeeri kausta"
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi v探i kaust:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -1657,167 +1668,162 @@ msgstr "H辰辰lestuse salvestamine eba探nnestus\n"
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Saabunud"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Saadetud"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "J辰rjekord"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Pr端gikast"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "Uus Kaust"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "S端mbol `%c' ei saa olla lisatud kausta nimele."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Kaust %s on juba olemas."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ei suuda luua kausta %s."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/Loo uus kaust..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/Nimeta kaust 端mbe_r..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/Kustuta kaust"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "T端hjenda pr端gikast"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/_Vaata uusi kirju"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/_Uuenda kausta puu"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/_Otsi kirju..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Telli uudi_stegrupp..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/Eemalda uudisteg_rupp"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Loon kausta vaate...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Uus"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Pole loetud"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Sean kausta info...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "Uuenda kausta puu"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:732
-#, fuzzy
-msgid "Rebuilding all folder trees..."
-msgstr "Uuendan k探igi kaustade puud..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "K探igis kaustades otsitakse uusi kirju..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Valitud on kaust %s\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Saadan kirja"
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1827,16 +1833,16 @@ msgstr ""
 "(kui soovite luua kausta, millesse saaks teisi kaustu lisada,\n"
 " siis lisage / nime l探ppu)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Sisesta uus nimi %s-le:"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Nimeta kaust 端mber"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1845,24 +1851,24 @@ msgstr ""
 "Kustutatakse k探ik kaustad ja kirjad %s-s.\n"
 "Kas sa t探esti soovid kustutada?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "T端hjenda pr端gikast"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "Kas eemaldada k探ik kirjad pr端gikastist?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1871,34 +1877,34 @@ msgstr ""
 "Kas t探epoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas t探esti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas t探esti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas t探esti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
@@ -1946,7 +1952,7 @@ msgstr "tundmatu"
 msgid "Can't retrieve newsgroup list."
 msgstr "Ei saanud uudistegrupi nimistut."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Tehtud."
 
@@ -2234,7 +2240,7 @@ msgstr "Impordi LDIF fail aadressiraamatusse"
 msgid "Prev"
 msgstr "Eelm"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "J辰rgmine"
 
@@ -2325,7 +2331,7 @@ msgstr "��hendan POP3 serveriga: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ei suuda 端henduda POP3 serveriga %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Autoriseerin..."
 
@@ -2355,7 +2361,7 @@ msgstr "V探tan kirjade suuruse (LIST)..."
 msgid "Deleting message %d"
 msgstr "Kustutan kirja %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "V辰ljun"
 
@@ -2399,7 +2405,8 @@ msgstr "Ei saa kirjutada faili.\n"
 msgid "Socket error."
 msgstr "Soketi viga\n"
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2414,19 +2421,19 @@ msgid ""
 "%s"
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr ""
 
@@ -2849,329 +2856,329 @@ msgstr "/_Vaade/_Kooditabel/Jaapan (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vaade/_Kooditabel/Hiina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/Vaade/Ava uues aknas"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_Vaade/N辰ita kirja l辰htekoodi"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_Vaade/N辰ita ko_gu p辰ist"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_Kiri"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Kiri/Kirjuta _端mber"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Kiri/V探ta _k探igilt kontodelt"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Kiri/V探ta _k探igilt kontodelt"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Kiri/Katkesta kirjade v探tmine"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Kiri/Kirjuta _端mber"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/_Kiri/_Saada j辰rjekorras olevad kirjad"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_Kiri/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_Kiri/Uus k_iri"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Kiri/Vasta/k_探igile"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Kiri/Vas_ta/_saatjale"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Kiri/Vasta/kirja _listi"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/_Kiri/Saada _edasi"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Kiri/Saada edasi _manusena"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/_Kiri/Suuna _端mber"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_Kiri/_Nihuta..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/_Kiri/K_opeeri..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_Kiri/Kustuta"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_Kiri/M_辰rk"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Kiri/M_辰rk/M_辰rgi"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Kiri/M_辰rk/_Eemaldan m辰rgi"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_Kiri/M_辰rk/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Kiri/M_辰rk/M辰rgin _mitteloetuks"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Kiri/M_辰rk/M辰rgin _loetuks"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Kiri/M_辰rk/M辰rgin _k探ik loetuks"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/_Kiri/Kirjuta _端mber"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_T旦旦riist/Lisa saatja aadressi raamatusse"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_T旦旦riist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_T旦旦riist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_T旦旦riist/Loo filtri reeglistik"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_T旦旦riist/Loo filtri reeglistik/Automaatselt"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_T旦旦riist/Loo filtri reeglistik/ kasutades Kellelt"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_T旦旦riist/Loo filtri reeglistik/kasutades Kellele"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_T旦旦riist/Loo filtri reeglistik/ kasutades p辰辰lkirja"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_T旦旦riist/_Kustuta topelt kirjad"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_T旦旦riist/K辰ivita"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/_T旦旦riist/_Teadete aken"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_H辰辰lestus"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_H辰辰lestus/_��ldised omadused..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_H辰辰lestus/_Filtri seaded..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_H辰辰lestus/_Mall..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_H辰辰lestus/Tegevused..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_H辰辰lestus/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_H辰辰lestus/_Hetkel kasutatava konto omadused..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_H辰辰lestus/_Loo uus konto..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_H辰辰lestus/_Redigeeri kontosid..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_H辰辰lestus/_Muuda kasutatavat kontot"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_Abi/_Juhend"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_Abi/_Juhend/_Inglise"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Abi/_Juhend/_Jaapani"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/_Abi/_KKK"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Abi/_KKK/_Inglise"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Abi/_KKK/_Saksa"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Abi/_KKK/_Hispaania"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Abi/_KKK/_Prantsuse"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Abi/_KKK/_Itaalia"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_Abi/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Loon peamise akna...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: v辰rvi haldamine %d eba探nnestus\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "tehtud.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Tiitlita"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "mittemiski"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Muudan akna eraldamise t端端pi %d-lt %d-le\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "T端hjenda pr端gikast"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Kas eemaldada k探ik kirjad pr端gikastist?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Lisa kirjakast"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3180,16 +3187,16 @@ msgstr ""
 "Sisesta kirjakasti asukoht.\n"
 "Kui m辰辰rate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3198,144 +3205,144 @@ msgstr ""
 "Kirjakasti loomine eba探nnestus.\n"
 "V探ibolla m探ned failid on olemas, v探i teil pole 探igusi sinna kirjutamiseks."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - kausta vaade"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Vastan"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Vasta ja saada koopia k探igile, kes said selle kirja"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Suuna 端mber"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "V探ta"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "V探ta uued kirjad"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "V探ta k探ik"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "V探ta k探igilt kontodelt uued kirjad"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Saada kirjad j辰rjekorrast"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Kirjuta"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Vasta"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Vasta kirjale"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "Vasta ja"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Vasta ja saada koopia k探igile, kes said selle kirja"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Edasta"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Saada kiri edasi"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Kustuta kiri"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "K辰ivita"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "K辰ivita m辰rgitud protsess"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "J辰rgmine kiri mida pole loetud"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Seaded"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "��ldised omaduse"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Konto seaded"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "V辰lju"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "L探petame programmi t旦旦."
 
@@ -3457,28 +3464,28 @@ msgstr "J探udsin kirja l探ppu; kas alustan algusest?"
 msgid "Search finished"
 msgstr "Otsimine l探petatud"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Loon kirja vaate...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Manused"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Tr端ki"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3487,7 +3494,7 @@ msgstr ""
 "Sisesta tr端kkimise k辰surida:\n"
 "(%s asendatakse failinimega)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3931,7 +3938,7 @@ msgstr "V探ta serverist k探ik kirjad"
 msgid "Receive size limit"
 msgstr "T探mbamise suuruse limiit"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr ""
 
@@ -3951,7 +3958,7 @@ msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
 msgid "Authentication method"
 msgstr "Autoriseerimise meetod"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Automaatne"
 
@@ -3975,7 +3982,7 @@ msgstr "Loo Kirja-ID"
 msgid "Add user-defined header"
 msgstr "Lisa kasutaja defineeritud p辰is"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Redigeeri... "
 
@@ -4447,30 +4454,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Lihtsustatud Hiina (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Lihtsustatud Hiina (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditsionaalne Hiina (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditsionaalne Hiina (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Hiina (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Tai (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Tai (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4479,458 +4491,458 @@ msgstr ""
 "Kui on m辰rgitud 'Automaatne', siis kasutatakse praeguse\n"
 "lokaali jaoks optimaalset kodeeringut."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "��辰rista enne saatmist"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Allkirja eraldaja"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Lisa automaatselt"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "K辰ivita v辰line redaktor automaatselt"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "Meelespeetavaid muudatusi"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "��辰rista kirjaread"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "s端mboli laiuseks"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "��辰rista tsitaati"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Murra k探ik pikad read sisestamisel"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "��辰rista enne saatmist"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "Vali vastuste jaoks konto automaatselt"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Kirjale vastamisel tsiteeri seda."
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "Vasta nupp k辰ivitab vastamise kirjalisti"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Vastuse formaat"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Tsitaadi m辰rk"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Edasta formaat"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " S端mbolite seletus "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Tekstistiil"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "T探lgi p辰ise nimed (n辰iteks From: Subject: ...)"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "N辰ita arvu, mitu kirja pole loetud, kausta nime j辰rel"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "l端henda uudistegruppe, mis on pikemad kui"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "t辰hte"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Kirjaloendi vaade"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "N辰ita kirja saajat 'Kellelt' tulbas, kui saatja olen mina ise"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Paisuta teemad"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Kuup辰eva formaat"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " M辰辰ra kirjaloendis n辰idatavad elemendid... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Kirja v辰rvimine lubatud"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "N辰ita 2-baidiliste s端mbolitega teksti 1-baidiliste s端mbolitega"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "N辰ita kirja p辰ist 端lalpool kirja vaadet"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "N辰ita p辰iseid l端hidalt"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Reavahe"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "pinkti"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Kerimine"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Pool lehte"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Sujuv kerimine"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Samm"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "P辰ise n辰itamine"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Automaatselt kontrolli allkirju"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "N辰ita allkirja kontrolli tulemusi ajutises aknas"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "S辰ilita parooli ajutiselt m辰lus"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Aegub p辰rast"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "minuteid"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Kui seada '0'-ks, siis parool salvesatakse\n"
 "kogu sessiooniks)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "*Krahma sisendit senikaua kuni parooli sisestatakse"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "N辰ita stardi ajal hoiatust kui GnuPG ei t旦旦ta"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Teate faili ei ole valitud."
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Kausta sisenedes ava esimene lugemata kiri"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "Kiri tuleb uues aknas avades m辰rkida kui loetu"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "Ava Sisendkaust peale uute kirjade vastuv探tmist"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Eemalda kohe peale liigutamist v探i kustutamist"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Kirjad lihtsalt m辰rgitakse enne t辰itmit\n"
 " kui see on v辰lja l端litatud)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 #, fuzzy
 msgid "Receive dialog"
 msgstr "N辰ita vastuv探tmise dialoogi"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "N辰ita vastuv探tmise dialoogi"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Alati"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Mitte iial"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "��ra tekita vea teadet vastuv探tmise vea korral"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Sulge vastuv探tmise dialoog kui l探petatud"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " M辰辰ra klahvi seosed... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "V辰lised k辰sklused (%s asendatakse faili / URI nimega)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Weebi sirvur"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "Lisa aadress sihtlahtrisse kui topeltkl探psutan"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "Programmist v辰ljumisel"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Kontrolli v辰ljumist"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "T端hjenda pr端gikast"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "K端si enne t端hjendamist"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Hoiata mind, kui j辰rjekorras on kirju"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "n辰dalap辰eva esit辰hed"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "t辰ielik n辰dalap辰eva nimi"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "l端hendatud kuu nimetus"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "t辰ispikk kuu nimetus"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "eelistatud kuup辰ev ja aeg kasutusel lokaali jaoks"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "sajandi number (aasta/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "Kuup辰ev k端mnendnumbrina"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "tund k端mnendnumbrina kasutades 24-tunnilist kella"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "tund k端mnendnumbrina kasutades 12-tunnilist kella"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "p辰ev aastas kui k端mnendnumber"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "kuu kui k端mnendnumber"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "minutid k端mnendnumbrina"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "kas EL v探i PL"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "sekundin k端mnendnumbrina"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "n辰dalap辰ev k端mnendnumbrina"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "eelistatud kuup辰ev"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "viimased kaks aasta numbrit"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "aasta k端mnendnumbrina"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "ajatsoon v探i nimi v探i l端hend"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "*M辰辰raja"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Seletus"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "N辰ide"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "S辰ti kirja v辰rvid"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "V辰rvid"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Tsiteeritud tekst - Aste 1"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Tsiteeritud tekst - Aste 2"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Tsiteeritud tekst - Aste 3"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI viide"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Tsitaadi v辰rvid ringelvad"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "Vali astme 1 tsitaadile v辰rv"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "Vali astme 2 tsitaadile v辰rv"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "Vali astme 3 tsitaadile v辰rv"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "Vali URI-le v辰rv"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "S端mbolite kirjeldus"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4954,11 +4966,11 @@ msgstr ""
 "Uudistegrupp\n"
 "Kirja-ID"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Kui x on seatud, n辰itab v辰ljendit"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4972,7 +4984,7 @@ msgstr ""
 "Tsiteeritud teate keha allkirjata\n"
 "Literaal %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4984,15 +4996,15 @@ msgstr ""
 "T辰ht avanev loogeline sulg\n"
 "T辰ht sulgev loogeline sulg"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Fondi valik"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Klahvi seosed"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -5002,11 +5014,11 @@ msgstr ""
 "Te v探ite ka modifitseerida iga men端端 kiirklahve vajutades\n"
 "suvalistele klahvidele asetades samal ajal hiire sellele."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Vana Sylpheed"
 
@@ -5074,213 +5086,208 @@ msgstr "Filtri s辰ttimine"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Kas te t探esti soovite seda reeglit kustutada?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Tiitlita"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Kustuta reegel"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "Kustuta reegel"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "Kogu p辰is"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "P辰is"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "Kiri"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "sisaldab"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "ei sisalda"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "Liiguta alla"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/Kopeeri..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "��ra v探ta vastu"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "Kustuta kaust"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "M辰rkused"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "S辰ti kirja v辰rvid"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/M辰rk/M辰rgi loetuks"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/Suuna 端mber"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "K辰ivita"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "Kaust"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "Aadress"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "P辰is"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "P辰is"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "P辰is"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Saaja pole m辰辰ratud."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "K辰surida ei ole sisestatud."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Sihtkaust pole m辰辰ratud."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "K辰surida ei ole sisestatud."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "faili %s ei leidu\n"
@@ -5538,60 +5545,60 @@ msgstr "��hendan"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "��hendun SMTP serveriga: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autoriseerimine"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 #, fuzzy
 msgid "Sending message..."
 msgstr "Saadan kirja"
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "Saadan KIRJA...."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "Saadan"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "Saadan RCPT..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "Saadan andmed..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "V辰ljun..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "Saadan kirja"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "Kirja saatmisel tekkis viga."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5898,120 +5905,120 @@ msgstr "Ei."
 msgid "Creating summary view...\n"
 msgstr "Loon kokkuv探tte vaate...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Protsessi m辰rk"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "M探ned m辰rgid on j辰辰nud. Protsessime selle?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Tuhnin kaustas (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Pole rohkem kirju, mida pole loetud."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Pole rohkem kirju, mida pole loetud. Otsime alates l探pust?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "Ei leidunud kirju mida pole loetud. Otsime j辰rgmisest kaustast?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "Otsi uuesti"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "Pole rohkem kirju"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Pole rohkem uusi kirju. Otsime alates l探pust?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "Uusi kirju ei ole."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "Uusi kirju ei leidu. Otsime j辰rgmisest kaustast?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Pole Rohkem m辰rgitud kirju"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "M辰rgitud kirju ei leidunud. Kas otsime l探pust?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "M辰rgitud kirju ei ole."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "M辰rgitud kirju ei leidunud. Kas otsime algusest?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Rohkem sildiga kirju ei ole"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Rohkem sildiga kirju ei leitud. Kas otsime l探pust?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "Rohkem sildiga kirju ei ole."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Rohkem seildiga kirju ei leitud. Kas otsime algusest?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "*V探tan kirju p辰辰lkirja j辰rgi..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d on kustutatud"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d on 端lekantud"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d on kopeeritud"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " kirja m辰rgitud"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "uusi %d, mitteloetuid %d, kokku %d (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "uusi %d, mitteloetuid %d, kokku %d"
@@ -6183,6 +6190,10 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "%s-i kirjutamine eba探nnestus.\n"
 
+#, fuzzy
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Uuendan k探igi kaustade puud..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_Vaade/_Kooditabel/---"
 
diff --git a/po/fr.po b/po/fr.po
index 5cda01b8..75fce5f3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: 2004-12-09 20:16+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -70,11 +70,11 @@ msgstr ""
 "programme. Si ce n'est pas le cas, 辿crivez �� la Free Software Foundation, "
 "Inc.,, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Lecture de la configuration des comptes...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -83,19 +83,19 @@ msgstr ""
 "Veuillez fermer toutes les fen棚tres de composition avant de configurer les "
 "comptes."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Ouverture de la fen棚tre de configuration de compte...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Cr辿ation de la fen棚tre de configuration de compte...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "��dition des comptes"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -104,8 +104,8 @@ msgstr ""
 "case dans la colonne G pour relever le courrier du compte \n"
 "correspondant lorsque 束 Tout relever 損 est activ辿"
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -113,60 +113,66 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protocole"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Serveur"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "��diter"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " Supprimer "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Plus bas"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Plus haut"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " D辿finir comme compte par d辿faut "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Voulez-vous vraiment supprimer ce compte ?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Sans titre"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Supprimer le compte"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "Voulez-vous vraiment supprimer ce compte ?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Oui"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Non"
 
@@ -235,7 +241,7 @@ msgstr "Envoyer"
 msgid "Abort"
 msgstr "Stopper"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -246,11 +252,11 @@ msgstr ""
 "(束 %%h 損 sera remplac辿 par l'argument saisi)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "Argument invisible de l'action"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -261,7 +267,7 @@ msgstr ""
 "(束 %%u 損 sera remplac辿 par l'argument saisi)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "Argument de l'action"
 
@@ -269,7 +275,7 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
@@ -355,8 +361,8 @@ msgstr "/_Adresse/��dit_er"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_Outils"
 
@@ -364,13 +370,13 @@ msgstr "/_Outils"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/A_ide/�� _propos"
 
@@ -387,10 +393,10 @@ msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -409,17 +415,17 @@ msgstr "/_Supprimer"
 msgid "E-Mail address"
 msgstr "Adresse 辿lectronique"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Nom :"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -592,7 +598,7 @@ msgid "Group"
 msgstr "Groupe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Dossier"
 
@@ -616,7 +622,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Information"
 
@@ -624,7 +630,7 @@ msgstr "Information"
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Erreur"
 
@@ -636,31 +642,31 @@ msgstr "Cr辿ation du dialogue d'alerte...\n"
 msgid "Show this message next time"
 msgstr "Afficher ce message la prochaine fois"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Orange"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "Rouge"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Rose"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Bleu ciel"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Bleu"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Vert"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Brun"
 
@@ -668,7 +674,7 @@ msgstr "Brun"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Aucun"
 
@@ -680,8 +686,8 @@ msgstr "/_Ajouter..."
 msgid "/_Remove"
 msgstr "/_Enlever"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/_Propri辿t辿s..."
 
@@ -841,8 +847,8 @@ msgstr "/_Affichage/_R辿pondre ��"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_Affichage/---"
 
@@ -869,7 +875,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -952,139 +958,144 @@ msgstr "/_Affichage/_Jeu de caract竪res/Chinois simplifi辿 (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_Affichage/_Jeu de caract竪res/Chinois simplifi辿 (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Affichage/_Jeu de caract竪res/Chinois traditionnel (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Affichage/_Jeu de caract竪res/Chinois traditionnel (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Affichage/_Jeu de caract竪res/Cor辿en (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Affichage/_Jeu de caract竪res/Tha誰 (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Affichage/_Jeu de caract竪res/Tha誰 (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_Outils/_Carnet d'adresses"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_Outils/_Mod竪le"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_Outils/_Actions"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Outils/Modifier avec un 辿diteur e_xterne"
 
-#: src/compose.c:674
+#: src/compose.c:676
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Outils/_Signer"
 
-#: src/compose.c:675
+#: src/compose.c:677
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Outils/_Chiffrer"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s : le fichier n'existe pas\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Impossible d'obtenir la partie texte\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr ""
 "Erreur du format de citation d'un message lors d'une r辿ponse ou d'un "
 "transfert."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [modifi辿]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composition d'un message%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Composition d'un message%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Destinataire non sp辿cifi辿."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgr辿 cela ?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1092,26 +1103,26 @@ msgstr ""
 "Aucun compte n'a 辿t辿 sp辿cifi辿 pour l'envoi.\n"
 "Veuillez s辿lectionner un compte avant d'envoyer du courrier."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Une erreur est survenue lors de l'envoi du message �� %s ."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Impossible d'enregistrer de message dans la bo樽te de messages envoy辿s"
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Impossible de trouver une touche associ辿e au code (de touche) 束 %s 損."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'acc竪s du fichier\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1120,140 +1131,140 @@ msgstr ""
 "Impossible de convertir le jeu de caract竪res du message\n"
 "de %s vers %s. Voulez-vous n辿anmoins l'envoyer ?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "impossible d'辿crire les en-t棚tes\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID cr辿辿 : %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Cr辿ation de la fen棚tre de composition...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Envoyer le message"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Envoi diff辿r辿"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "Mettre en file d'attente et envoyer plus tard"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Brouillon"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Insertion"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Ins辿rer un fichier"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Joindre"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Joindre un fichier"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Signature"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Ins辿rer la signature"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "��diteur de texte"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "��diter avec un 辿diteur externe"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Justifier"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "Propri辿t辿s"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Chemin d'acc竪s"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "La ligne de commande pour l'辿diteur externe est invalide : 束 %s 損\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1264,74 +1275,74 @@ msgstr ""
 "Forcer sa fermeture ?\n"
 "id de traitement de groupe: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Id de traitement de groupe termin辿 : %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fichier temporaire : %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Compose : entr辿e �� partir d'une surveillance de traitement\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Impossible de lancer l'辿diteur externe\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Impossible d'辿crire dans le fichier\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "��chec de lecture de pipe\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Interruption de la composition du message"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr ""
 "Ce message a 辿t辿 modifi辿 mais pas envoy辿. Voulez-vous interrompre la "
 "composition ?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Interrompre"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "vers brouillon"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le mod竪le 束 %s 損 ?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Appliquer un mod竪le"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Remplacer"
 
@@ -1493,12 +1504,12 @@ msgstr "��dition du dossier"
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -1668,161 +1679,157 @@ msgstr "��chec d'辿criture de la configuration dans le fichier\n"
 msgid "Select folder"
 msgstr "Choix d'un dossier"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "R辿ception"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Envoy辿"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "File d'attente"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "束 %c 損 n'est pas valide dans le nom du dossier."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier 束 %s 損 existe d辿j��."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossible de cr辿er le dossier 束 %s 損."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/Cr辿er un _nouveau dossier..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/_Renommer le dossier..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/_Supprimer le dossier"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 msgid "/Empty _trash"
 msgstr "/_Vider la corbeille"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/Re_chercher les nouveaux messages"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/Reconstruire l'_arborescence"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/Rechercher dans le _dossier..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 msgid "/Down_load"
 msgstr "/T辿_l辿charger"
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Inscription aux groupes de discussion..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/_Supprimer le groupe de discussion"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Cr辿ation de la vue des dossiers...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Nouveau"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Enregistrement des donn辿es des dossiers...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Initialisation des donn辿es des dossiers..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "Reconstruire l'_arborescence"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'arborescence va 棚tre reconstruite. Poursuivre ?"
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstruction de l'arborescence a 辿chou辿."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Reconstruction de l'arborescence compl竪te..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Recherche des nouveaux messages..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Dossier %s s辿lectionn辿\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "T辿l辿chargement des messages dans %s ..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr ""
 "Une erreur est survenue lors du t辿l辿chargement des messages dans 束 %s 損."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1832,16 +1839,16 @@ msgstr ""
 "(si vous voulez cr辿er un dossier pouvant contenir d'autres dossiers,\n"
 " ajouter `/' �� la fin du nom)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Saisissez le nouveau nom pour 束 %s 損 :"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1850,24 +1857,24 @@ msgstr ""
 "Tous les dossiers et messages sous 束 %s 損 vont 棚tre supprim辿s.\n"
 "Voulez-vous vraiment les supprimer ?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Impossible de supprimer le dossier 束 %s 損."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "Supprimer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1876,34 +1883,34 @@ msgstr ""
 "Ne plus utiliser la bo樽te aux lettres 束 %s 損 (les\n"
 "messages existants ne seront PAS effac辿s du disque) ?"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Suppression d'une bo樽te aux lettres"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 束 %s 損 ?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion 束 %s 損 ?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte 束 %s 損 des groupes de discussion ?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
@@ -1951,7 +1958,7 @@ msgstr "inconnu"
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossible d'obtenir la liste des groupes de discussion."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Termin辿."
 
@@ -2236,7 +2243,7 @@ msgstr "Importation d'un fichier LDIF dans un carnet d'adresses"
 msgid "Prev"
 msgstr "Pr辿c辿dent"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "Suivant"
 
@@ -2326,7 +2333,7 @@ msgstr "Connexion au serveur POP3 : %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Authentification..."
 
@@ -2356,7 +2363,7 @@ msgstr "R辿cup辿ration de la taille des messages"
 msgid "Deleting message %d"
 msgstr "Suppression du message %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Fermeture"
 
@@ -2399,7 +2406,8 @@ msgstr "Impossible d'辿crire dans le fichier."
 msgid "Socket error."
 msgstr "Erreur de protocole."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "La connexion a 辿t辿 ferm辿e par le serveur."
 
@@ -2416,11 +2424,11 @@ msgstr ""
 "Bo樽te verrouill辿e :\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "L'authentification �� 辿chou辿."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2429,7 +2437,7 @@ msgstr ""
 "L'authentification a 辿chou辿 :\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr "D辿passement du d辿lai de r辿ponse (timeout) de la session."
 
@@ -2851,320 +2859,320 @@ msgstr "/_Affichage/_Jeu de caract竪res/Japonais (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Affichage/_Jeu de caract竪res/Japonais (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Affichage/_Jeu de caract竪res/Chinois (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Affichage/_Jeu de caract竪res/Cor辿en (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Affichage/_Ouvrir dans une nouvelle fen棚tre"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_Affichage/_Voir le message complet"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_Affichage/Afficher tous les e_n-t棚tes"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_Affichage/Mettre �� jo_ur le r辿sum辿 des messages"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_Message"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 msgid "/_Message/Recei_ve"
 msgstr "/_Message/R辿ce_ptionner"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Message/R辿ce_ptionner/le courrier du _compte courant"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Message/R辿ce_ptionner/le courrier de _tous les comptes"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Message/R辿ce_ptionner/_Annuler la r辿ception"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Message/R辿ce_ptionner/---"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/_Message/En_voyer les messages en file d'attente"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_Message/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_Message/Composer un _nouveau message"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_Message/_R辿pondre"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/_Message/R辿p_ondre ��"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Message/R辿p_ondre ��/_tous"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Message/R辿p_ondre ��/l'_exp辿diteur"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Message/R辿p_ondre ��/la _liste"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/_Message/_Transf辿rer"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Message/Transf辿rer en tant que pi竪ce _jointe"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/_Message/Rediri_ger"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_Message/_D辿placer..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/_Message/_Copier..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_Message/_Supprimer"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_Message/_Marquer"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Message/_Marquer/_Marquer"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Message/_Marquer/_D辿marquer"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_Message/_Marquer/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Message/_Marque/Marquer comme _non lu"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Message/_Marque/Marquer comme _lu"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Message/_Marque/Marquer _tous comme lu"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/R辿辿dit_er"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Outils/Aj_outer l'exp辿diteur dans le carnet d'adresses"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Outils/_Filtrer les messages du dossier"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Outils/Filtrer les messages _s辿lectionn辿s"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Outils/Cr辿er une r竪gle de f_iltrage"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Outils/Cr辿er une r竪gle de f_iltrage/automatiq_uement"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Outils/Cr辿er une r竪gle de f_iltrage/bas辿e sur l'_exp辿diteur"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Outils/Cr辿er une r竪gle de f_iltrage/bas辿e sur le(s) _destinataire(s)"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Outils/Cr辿er une r竪gle de f_iltrage/bas辿e sur le _sujet"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Message/Supprimer les messages en dou_ble"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_Outils/E_x辿cuter"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/Ou_tils/_Journal de connexion"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Configuration"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuration/Pr辿f辿rences _g辿n辿rales..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuration/_Filtres..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuration/_Mod竪les..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuration/_Actions..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Configuration/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuration/_Configuration du compte courant..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuration/Cr辿ation d'un _nouveau compte..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuration/��dition des compt_es..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuration/Choi_sir un autre compte"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/A_ide/_Manuel"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/A_ide/_Manuel/_Anglais"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_ide/_Manuel/_Japonais"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Anglais"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/A_llemand"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Espagnol"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Fran巽ais"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Italien"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/A_ide/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Cr辿ation de la fen棚tre principale...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fen棚tre principale : allocation de la couleur %d 辿chou辿e\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "termin辿.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "aucun"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Changement du type de s辿paration de fen棚tre de %d vers %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr "D辿connect辿"
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr "Vous 棚tes d辿connect辿. Voulez-vous vous connecter ?"
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 msgid "Empty all trash"
 msgstr "Vider toutes les corbeilles"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 msgid "Empty messages in all trash?"
 msgstr "Supprimer tous les messages dans les corbeilles ?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Nouvelle bo樽te aux lettres"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3173,16 +3181,16 @@ msgstr ""
 "Saisissez le nom de la nouvelle bo樽te aux lettres. Si elle\n"
 "existe d辿j��, elle sera automatiquement analys辿e."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La bo樽te aux lettres 束 %s 損 existe d辿j��."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Bo樽te aux lettres"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3192,141 +3200,141 @@ msgstr ""
 "Il se peut que les fichiers existent d辿j��, ou que vous n'ayez pas les droits "
 "en 辿criture."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_R辿pondre"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 msgid "/Reply to _all"
 msgstr "/R辿pondre �� _tous"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 msgid "/Reply to _sender"
 msgstr "/R辿pondre �� l'_exp辿diteur"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 msgid "/Reply to mailing _list"
 msgstr "/R辿pondre �� la _liste"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Transf辿rer"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Transf辿rer en pi竪ce _jointe"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Relever"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Relever le courrier du compte courant"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Tout relever"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "Relever le courrier de tous les comptes"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Envoyer les messages en attente"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Composer"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Composer un nouveau message"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "R辿pondre"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "R辿pondre au message"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "�� tous"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "R辿pondre �� tous"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Transf辿rer"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Transf辿rer le message"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Supprimer le message"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Ex辿cuter"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Ex辿cuter les commandes marqu辿es"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "Message non lu suivant"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Pr辿f辿rences"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "Pr辿f辿rences g辿n辿rales"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Compte"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Configuration du compte courant"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 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:2445
+#: src/mainwindow.c:2447
 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:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
@@ -3448,28 +3456,28 @@ msgstr "Fin de message atteint, reprendre depuis le d辿but ?"
 msgid "Search finished"
 msgstr "Recherche termin辿e"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Cr辿ation de la vue message...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Texte"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Pi竪ces jointes"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier 束 %s 損."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Impression"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3478,7 +3486,7 @@ msgstr ""
 "Saisissez la ligne commande pour imprimer :\n"
 "(束 %s 損 sera remplac辿 par le nom du fichier)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3920,7 +3928,7 @@ msgstr "R辿ception de tous les messages sur le serveur"
 msgid "Receive size limit"
 msgstr "Taille maximale pour la r辿ception"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "Ko"
 
@@ -3940,7 +3948,7 @@ msgstr "(Les messages non filtr辿s seront plac辿s dans ce dossier)"
 msgid "Authentication method"
 msgstr "M辿thode d'authentification"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Automatique"
 
@@ -3964,7 +3972,7 @@ msgstr "G辿n辿ration d'un Message-ID"
 msgid "Add user-defined header"
 msgstr "Ajouter des en-t棚tes suppl辿mentaires"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Modifier... "
 
@@ -4438,30 +4446,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Chinois simplifi辿 (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Chinois simplifi辿 (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinois traditionnel (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinois traditionnel (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinois (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Cor辿en (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Tha誰 (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Tha誰 (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4470,11 +4483,11 @@ msgstr ""
 "Si 束 Automatique 損 est s辿lectionn辿, le jeu de caract竪res optimal pour le\n"
 "language utilis辿 sera choisi automatiquement."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "Algo. de transmission"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4483,120 +4496,120 @@ msgstr ""
 "Pr辿cise le champ 束 Content-Transfer-Encoding 損 utilis辿 quand\n"
 "le corps du message contient des caract竪res non ASCII."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "S辿parateur de signature"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Ins辿rer automatiquement"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Lancer automatiquement l'辿diteur externe"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "Nombre maximal d'annulations"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Justifier les messages ��"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "caract竪res"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Justifier la citation"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Justification automatique"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Justifier avant d'envoyer"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "S辿lection automatique du compte lors d'une r辿ponse"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Citer le message en r辿pondant"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "Le bouton r辿pondre agit pour la liste de diffusion"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Citation lors d'une r辿ponse"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Caract竪re de citation"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Citation lors d'un transfert"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Description des symboles "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Police"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traduire le nom des en-t棚tes 束 From: 損, 束 Subject: 損, etc."
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Afficher le nombre de messages non lus pr竪s du nom de dossier"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abr辿ger les noms des groupes de discussion de plus de"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "lettres"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "R辿sum辿 des messages"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Afficher le destinataire dans la colonne 束 Exp辿diteur 損 si vous 棚tes "
 "l'exp辿diteur du message"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "D辿ployer les fils de conversation"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Format de la date"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " ��l辿ments affich辿s dans le r辿sum辿... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Coloration des messages"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4604,326 +4617,326 @@ msgstr ""
 "Afficher l'alphabet et les nombres multi-octets\n"
 "comme des caract竪res ASCII (Japonais seulement)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Afficher un panneau d'en-t棚tes au dessus du message"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Afficher des en-t棚tes courts dans la fen棚tre des messages"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Espacement des lignes"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "D辿filement"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Demi-page"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "D辿filement continu"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "par pas de"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr "Adapter les images aux dimensions de la fen棚tre des messages"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Options d'affichage des en-t棚tes"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "V辿rifier automatiquement les signatures"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Afficher le r辿sultat de la v辿rification dans une fen棚tre"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "M辿moriser temporairement la phrase secr竪te"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Expiration apr竪s"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "minute(s) "
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Mettre 0 pour m辿moriser la phrase secr竪te\n"
 " pendant toute la dur辿e de la session)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Monopoliser le clavier pendant la saisie de la phrase secr竪te"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Afficher un avertissement si GnuPG ne fonctionne pas"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "Ouvrir automatiquement les messages s辿lectionn辿s dans le r辿sum辿"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Ouvrir le premier message non lu en ouvrant un dossier"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Marquer un message comme lu uniquement si ouvert dans une nouvelle fen棚tre"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "Aller dans la bo樽te de r辿ception lors de l'arriv辿e de nouveau courrier"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Ex辿cuter imm辿diatement la suppression ou le d辿placement de messages"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "(sinon, les messages resteront marqu辿s jusqu'�� ex辿cution)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Message de r辿ception"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Afficher une fen棚tre lors de la r辿ception :"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr " toujours"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr "Seulement lors d'une rel竪ve manuelle du courrier"
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr " jamais"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne pas afficher de fen棚tre d'erreur lors d'une erreur de r辿ception"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Fermer la fen棚tre de r辿ception �� la fin"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " Choisir les raccourcis clavier... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Commandes externes (%s sera remplac辿 par le nom du fichier/URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Navigateur web"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "Un double-clic sur une adresse l'ajoute �� la liste des destinataires"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "En quittant"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Confirmer en quittant"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "Vider la corbeille en quittant"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Demander avant de vider"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Avertir s'il y a des messages �� envoyer en file d'attente"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "D辿passement du d辿lai de r辿ponse (timeout) des E/S du socket :"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "seconde(s)"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "nom du jour de la semaine (abr辿g辿)"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "nom du jour de la semaine"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "nom du mois (abr辿g辿)"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "nom du mois"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "le format par d辿faut de la date et de l'heure"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "le 'si竪cle' (ann辿e/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "le jour du mois"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'heure en tant que nombre (0-23)"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'heure en tant que nombre (1-12)"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "le jour de l'ann辿e en tant que nombre"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "le mois en tant que nombre"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "les minutes en tant que nombre"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "AM (matin) ou PM (apr竪s-midi)"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "les secondes en tant que nombre"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "le jour de la semaine en tant que nombre"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "le format par d辿faut de la date"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "les deux derniers chiffres de l'ann辿e"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "l'ann辿e"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "le fuseau horaire, son nom ou abr辿viation"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Code"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Description"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "Exemple"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Param辿trer les couleurs de message"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Texte cit辿 - 1er niveau"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Texte cit辿 - 2e niveau"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Texte cit辿 - 3e niveau"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "Lien URI"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "R辿utiliser les couleurs"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "Choix de la couleur de la citation niveau 1"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "Choix de la couleur de la citation niveau 2"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "Choix de la couleur de la citation niveau 3"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "Choix de la couleur pour les liens URI"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Description des symboles"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4947,11 +4960,11 @@ msgstr ""
 "Groupes de discussions\n"
 "Message-ID"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Si x est d辿fini, afficher expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4965,7 +4978,7 @@ msgstr ""
 "Corps du message sans signature en tant que citation\n"
 "Caract竪re pourcent 束 % 損"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4977,15 +4990,15 @@ msgstr ""
 "Caract竪re 束 { 損\n"
 "Caract竪re 束 } 損"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "S辿lection de la police"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Raccourcis clavier"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4997,11 +5010,11 @@ msgstr ""
 "en le pointant avec la souris et en pressant une\n"
 "combinaison de touches."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "Par d辿faut"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Ancien Sylpheed"
 
@@ -5069,190 +5082,185 @@ msgstr "R竪gles de filtrage"
 msgid "Enabled"
 msgstr "Activ辿"
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Voulez-vous vraiment supprimer cette r竪gle ?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Sans titre"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Supprimer une r竪gle"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 msgid "Filter rule"
 msgstr "R竪gle de filtrage"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr "Si au moins une des conditions suivantes est remplie"
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr "Si toutes les conditions suivantes sont remplies"
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr "Effectuer les actions suivantes :"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr "To ou Cc"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 msgid "Any header"
 msgstr "Tout en-t棚te"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 msgid "Edit header..."
 msgstr "��diter l'en-t棚te..."
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 msgid "Message body"
 msgstr "Corps du message"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr "R辿sultat de la commande"
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr "Age"
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "contient"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 msgid "doesn't contain"
 msgstr "ne contient pas"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr "est"
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr "n'est pas"
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr "v辿rifie l'expression r辿guli竪re"
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr "ne v辿rifie pas l'expression r辿guli竪re"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr "est plus grand que"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr "est plus petit que"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr "est plus long que"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr "est plus court que"
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "D辿placer vers"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 msgid "Copy to"
 msgstr "Copier vers"
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Ne pas recevoir"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 msgid "Delete from server"
 msgstr "Effacer du serveur"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 msgid "Set mark"
 msgstr "Marquer"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 msgid "Set color"
 msgstr "Colorer"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 msgid "Forward as attachment"
 msgstr "Transf辿rer en pi竪ce jointe"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 msgid "Redirect"
 msgstr "Rediriger"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 msgid "Execute command"
 msgstr "Ex辿cuter la commande"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr "Arr棚ter l'辿valuation de la r竪gle"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 msgid "folder:"
 msgstr "dossier :"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 msgid "address:"
 msgstr "adresse :"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 msgid "Edit header list"
 msgstr "��diter la liste des en-t棚tes"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 msgid "Headers"
 msgstr "En-t棚tes"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 msgid "Header:"
 msgstr "En-t棚te :"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 msgid "Rule name is not specified."
 msgstr "Le nom de la r竪gle n'est pas sp辿cifi辿."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 msgid "Command is not specified."
 msgstr "La commande n'a pas 辿t辿 d辿finie."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr "Une condition invalide est pr辿sente."
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 msgid "Destination folder is not specified."
 msgstr "Le dossier cible n'a pas 辿t辿 d辿fini."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr "Une action invalide est pr辿sente."
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 msgid "Condition not exist."
 msgstr "La condition n'existe pas."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 msgid "Action not exist."
 msgstr "L'action n'existe pas."
 
@@ -5508,56 +5516,56 @@ msgstr "Connexion"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Connection au serveur SMTP : %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "Envoi de HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "Envoi du message..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "Envoi de EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "Envoi de MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "Envoi"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "Envoi de RCPT TO"
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "Envoi de DATA"
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Fermeture..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Envoi du message (%d / %d octets)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "Envoi de message"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "Une erreur est survenue pendant l'envoi de message."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5864,120 +5872,120 @@ msgstr "N属"
 msgid "Creating summary view...\n"
 msgstr "Cr辿ation de la vue de l'index...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Traitement des messages marqu辿s"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Il reste des messages marqu辿s, voulez-vous les traiter ?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "Pas de message non lu. Passer au dossier suivant ?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "Chercher encore"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "Pas de nouveaux messages."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "Plus de nouveaux messages. Aller au dossier suivant ?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Plus de messages marqu辿s"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqu辿s. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "Pas de message marqu辿."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "Plus de messages marqu辿s. Rechercher depuis le d辿but ?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Plus de messages marqu辿s"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages marqu辿s. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "Plus de messages marqu辿s."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages marqu辿s. Rechercher depuis le d辿but ?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d effac辿"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d d辿plac辿"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copi辿"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " 辿l辿ment(s) s辿lectionn辿(s)"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nouveau(x), %d non lu(s), %d au total (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nouveau(x), %d non lu(s), %d au total"
@@ -6151,6 +6159,9 @@ msgstr "%.2f Go"
 msgid "writing to %s failed.\n"
 msgstr "L'辿criture dans %s a 辿chou辿.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Reconstruction de l'arborescence compl竪te..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_Affichage/_Jeu de caract竪res/---"
 
diff --git a/po/gl.po b/po/gl.po
index d8ba0f1e..f8ec78ec 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -64,11 +64,11 @@ msgstr ""
 "con este programa; en caso contrario, escriba a  Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Lendo configuraci坦n de cada conta...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -76,19 +76,19 @@ msgstr ""
 "Hai Fiestras de composici坦n abertas.\n"
 "Peche todas as fiestras de composici坦n antes de editar as contas."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Abrindo fiestra de edici坦n de conta...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Creando fiestra de edici坦n de conta...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Editar contas"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -96,8 +96,8 @@ msgstr ""
 "A orde de comprobaci坦n de mensaxes ser叩 este. Marque as casilas\n"
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -105,60 +105,66 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Servidor"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Engadir"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Editar"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " Borrar "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Arriba"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " conta por defecto "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "多Realmente quere borrar esta conta?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Sen t鱈tulo"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Borrar conta"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "多Realmente quere borrar esta conta?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Si"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Non"
 
@@ -227,7 +233,7 @@ msgstr " Enviar "
 msgid "Abort"
 msgstr "Abortar"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -237,11 +243,11 @@ msgstr ""
 "Teclee o argumento para a seguinte acci坦n:\n"
 "(`%s' ser叩 sustituido polo argumento)"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -251,7 +257,7 @@ msgstr ""
 "Teclee o argumento para a seguinte acci坦n:\n"
 "(`%s' ser叩 sustituido polo argumento)"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr ""
 
@@ -259,7 +265,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo 叩 axenda"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Enderezo"
@@ -345,8 +351,8 @@ msgstr "/_Enderezo/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
@@ -354,13 +360,13 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
@@ -377,10 +383,10 @@ msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -399,17 +405,17 @@ msgstr "/_Borrar"
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -579,7 +585,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -603,7 +609,7 @@ msgstr "Enderezo com炭n"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Notificaci坦n"
 
@@ -611,7 +617,7 @@ msgstr "Notificaci坦n"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Erro"
 
@@ -623,31 +629,31 @@ msgstr "Creando o di叩logo de alerta...\n"
 msgid "Show this message next time"
 msgstr "Mostrar este mensaxe de novo"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Laranxa"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "Bermello"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Azul ceo"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Azul"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Verde"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Marr坦n"
 
@@ -655,7 +661,7 @@ msgstr "Marr坦n"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Ning炭n"
 
@@ -667,8 +673,8 @@ msgstr "/_Engadir"
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -833,8 +839,8 @@ msgstr "/_Ver/_Respostar a"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
@@ -861,7 +867,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -944,141 +950,146 @@ msgstr "/_Ver/_Codificaci坦n/Chines simplificado (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_Ver/_Codificaci坦n/Chines simplificado (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Codificaci坦n/Chines tradicional (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/_Codificaci坦n/Chines tradicional (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/_Codificaci坦n/Coreano (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/_Codificaci坦n/Tailand辿s (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/_Codificaci坦n/Tailand辿s (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Axenda de enderezos"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/Acci坦_ns"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con editor e_xterno"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/Acci坦_ns"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Non se pode obter o texto\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 #, fuzzy
 msgid "Quote mark format error."
 msgstr "Marca de cita para erro."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Non se pode obter o tama単o de %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compo単er mensaxe%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Compo単er mensaxe%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. 多Enviar de todas formas?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1086,26 +1097,26 @@ msgstr ""
 "Non especific坦 ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Non puiden atopar ningunha clave asociada con a Id-clave actual `%s'."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1115,140 +1126,140 @@ msgstr ""
 "%s a %s.\n"
 "多Envia-lo de todo xeito?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "non se poden escribir as cabeceiras\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "po単endo na cola...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode po単er na cola\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Tama単o"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "Po単er na cola e enviar mais tarde"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Gardar como borrador"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Inserir ficheiro"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Adxuntar"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Sinatura"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Inserir sinatura"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Cortar todas as l鱈neas longas"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inv叩lido."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou est叩 valeiro."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Codificaci坦n"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "o comando do editor externo non e v叩lido: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1259,72 +1270,72 @@ msgstr ""
 "多Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado proceso id.: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ficheiro temporal: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Compo単er: entrada dende proceso monitor\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Non se puido executar o editor externo\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Non se puido escribir no ficheiro\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Fallo lendo tuber鱈a\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode po単er na cola."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Descartar Mensaxe"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Esta mensaxe foi modificado. 多Desea descartala?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "a Borrador"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "多Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Substitu鱈r"
 
@@ -1485,12 +1496,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -1660,163 +1671,159 @@ msgstr "fallo escribiendo a configuraci坦n a ficheiro\n"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Papeleira"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' non pode estar no nome da carpeta."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "a carpeta `%s' xa existe."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Non se pode crear a carpeta `%s'."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/Crear _nova carpeta..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/_Renomear carpeta..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hai mensaxes novas"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir 叩rbre de carpetas"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/_Buscar nas mensaxes"
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "Non hai mensaxes sin leer."
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Novos"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Non le鱈dos"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "N尊"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Establecendo informaci坦n de carpeta...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Establecendo informaci坦n de carpeta..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "Reconstruir arbre de carpetas"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Reconstruindo todos os arbores de carpetas..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1826,16 +1833,16 @@ msgstr ""
 "(si quere crear unha carpeta para almacenar subcarpetas,\n"
 " engada `/' o final do nome)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Renomear carpeta"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1844,24 +1851,24 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' ser叩n borrados.\n"
 "多Confirma o borrado?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "多Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1870,34 +1877,34 @@ msgstr ""
 "多Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrar叩n do disco)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "多Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "多Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "多Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
@@ -1945,7 +1952,7 @@ msgstr "desconecido"
 msgid "Can't retrieve newsgroup list."
 msgstr "Non se pode obter a lista de grupos."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Feito."
 
@@ -2232,7 +2239,7 @@ msgstr "Importar ficheiro LDIF na axenda"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "Seguinte"
 
@@ -2323,7 +2330,7 @@ msgstr "Conectando 坦 servidor POP3: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Non se pode conectar 坦 servirdor POP3: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
@@ -2353,7 +2360,7 @@ msgstr "Obtendo o tama単o de novas mensaxes (LIST)..."
 msgid "Deleting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Sa鱈ndo"
 
@@ -2397,7 +2404,8 @@ msgstr "Non se pode escribir o ficheiro."
 msgid "Socket error."
 msgstr "Error de socket."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2414,12 +2422,12 @@ msgstr ""
 "a caixa de correo esta bloqueada:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Fallo de autenticaci坦n"
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2428,7 +2436,7 @@ msgstr ""
 "Fallo de autenticaci坦n:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr ""
 
@@ -2850,329 +2858,329 @@ msgstr "/_Ver/_Codificaci坦n/Xapon辿s (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Codificaci坦n/Xapon辿s (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Codificaci坦n/Chines (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Codificaci坦n/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en fiestra _nova"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fonte da mens_axe"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_Ver/Mostrar todas as cabeceiras"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_Mensaxe"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensaxe/_Cancelar recepci坦n"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaxe/Enviar mensa_xes da cola"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_Mensaxe/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaxe/Compo単er _nova mensaxe"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_Mensaxe/_Respostar"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaxe/Respos_tar a"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaxe/Respos_tar a/A _todos"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaxe/Respos_tar a/�� _remitente"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaxe/Respos_tar a/�� _lista de correo"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/_Mensaxe/_Reenviar"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaxe/Reen_viar como adxunto"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaxe/Red_irixir"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaxe/M_over..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaxe/_Copiar..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_Mensaxe/_Borrar"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_Mensaxe/_Marcar"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaxe/_Marcar/_Marcar"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaxe/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaxe/_Marcar/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaxe/_Marcar/Marcar como non le鱈do"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaxe/_Marcar/Marcar como le鱈do"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaxe/_Marcar/Marcar todo como le鱈do"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Engadir _remitente 叩 axenda"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Crear Regra de filtrado"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/_Autom叩ticamente"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Dende"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Para"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada no _Asunto"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/Borrar as mensaxes re_petidas"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Fiestra de traza"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Configuraci坦n"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuraci坦n/Preferencias _comuns..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuraci坦n/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuraci坦n/_Plantillas ..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuraci坦n/_Accions..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Configuraci坦n/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuraci坦n/_Preferencias da conta actual..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuraci坦n/Crear _nova conta..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuraci坦n/_Editar contas..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuraci坦n/_Cambiar conta actual"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_Axuda/_Manual"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_Axuda/_Manual/_Ingl辿s"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Axuda/_Manual/_Xapon辿s"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/_Axuda/_FAQ"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Axuda/_FAQ/_Ingl辿s"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Axyuda/_FAQ/_Alem叩n"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Axuda/_FAQ/_Espa単ol"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Axuda/_FAQ/_Franc辿s"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Axuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_Axuda/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Creando Fiestra principal...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Sen t鱈tulo"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "ningunha"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambiando o tipo de separaci坦n de fiestra de %d a %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Baleirar papeleira"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "多Baleirar todas as mensaxes da papeleira?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Engadir caixa de correo"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3182,16 +3190,16 @@ msgstr ""
 "Si xa existe ser叩\n"
 "examinado autom叩ticamente."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3201,144 +3209,144 @@ msgstr ""
 "Quiz叩is xa existan os ficheiros ou non te単a permisos suficientes para "
 "escribir no directorio."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Arbre de carpetas"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Respostar"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Respon_der a/�� _remitente"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/�� _lista de correo"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Traer"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Incorporar correo novo"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Traer todo"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar correo novo de todas as contas"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Compo単er"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Compo単er mensaxe novo"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Respostar"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Respostar 坦 mensaxe"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "A todos"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Reenviar"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Reenviar o mensaxe"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Borrar o mensaxe"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "Seguinte non le鱈do"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "Preferencias comuns"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "conta"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Preferencias da conta"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "多Sair do programa?"
 
@@ -3460,28 +3468,28 @@ msgstr "Cheg坦use 坦 final da mensaxe. 多Seguir dende o principio?"
 msgid "Search finished"
 msgstr "B炭squeda concluida"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Creando visor de mensaxe...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Adxuntos"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3490,7 +3498,7 @@ msgstr ""
 "Teclee o comando para imprimir:\n"
 "(`%s' ser叩 sustituido por o ficheiro)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3932,7 +3940,7 @@ msgstr "Descargar todas as mensaxes do servidor"
 msgid "Receive size limit"
 msgstr "Tama単o l鱈mite para recibir"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr ""
 
@@ -3952,7 +3960,7 @@ msgstr "(As mensaxes sen filtrar gardar叩nse nesta carpeta)"
 msgid "Authentication method"
 msgstr "M辿todo de autenticaci坦n"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Autom叩tica"
 
@@ -3976,7 +3984,7 @@ msgstr "Xenerar ID-Mensaxe"
 msgid "Add user-defined header"
 msgstr "Engadir cabeceira de usuario"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4445,30 +4453,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Chines simplificado (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Chines simplificado (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Chines tradicional (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chines tradicional (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chines (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Tailand辿s (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Tailand辿s (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4477,11 +4490,11 @@ msgstr ""
 "Si se selecciona `Autom叩tico' utilizarase a\n"
 "codificaci坦n 坦ptima para a localizaci坦n actual."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "Codificaci坦n de transferencia"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4490,118 +4503,118 @@ msgstr ""
 "Especificar a codificaci坦n de transferencia (Content-Transfer-Encoding)\n"
 "cando o corpo do mensaxe conten caracteres non-ASCII."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Separador de sinatura"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Inserir autom叩ticamente"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Lanzar o editor externo autom叩ticamente"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "Niveles de desfacer"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Recortar mensaxes 坦s"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Recortar citaci坦n"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Recortar mentras se escribe"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Recortar antes de enviar"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "Seleccionar autom叩ticamente a conta para respostar"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Citar a mensaxe 坦 respostar"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "o bot坦n Respostar invoca respostar 叩 lista de correo"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Formato de r辿plica"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Marca de citaci坦n"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Formato de reenvio"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Descripci坦n de s鱈mbolos "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Fonte"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traducir cabeceiras (como `Dende:', `Asunto:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Ver o n炭mero de non le鱈das xunto 坦 nome da carpeta"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar nomes de grupos con mais de"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Vista resumo"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Ver destinatario na columna `Dende' si o remitente 辿 vostede mismo"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Expandir f鱈os"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Formato de data"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " Elementos visibles no resumo... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Permitir cores na mensaxe"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4609,328 +4622,328 @@ msgstr ""
 "Mostrar alfab辿ticos e num辿ricos multi-byte como\n"
 "caracteres ASCII (s坦 para Xapon辿s)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceiras sobre a mensaxe"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "cabeceiras breves na vista da mensaxe"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Interlineado"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Desplazamento"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Media p叩xina"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Paso"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar as im叩xes adxuntas"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Ver propiedades de cabeceiras"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Comprobar as sinaturas autom叩ticamente"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Mostrar di叩logo de comprobaci坦n de sinatura"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Manter contrasinal en memoria temporalmente"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Expirar despois de"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "minuto(s) "
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Poniendo '0' mantendr叩 a contrase単a\n"
 " durante toda a sesi坦n)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar a entrada mentras se introducen contrasinais"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar aviso no inicio si non funciona GnuPG"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "Abrir sempre as mensaxes no sumario cando se seleccionan"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Abrir a primeira mensaxe non le鱈da 坦 abrir unha carpeta"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "Marcar mensaxe como le鱈da s坦 坦 abrila nunha fiestra nova"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "Abrir entrada despois de recibir correo novo"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar inmediatamente movimentos ou borrados de mensaxes"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Os mensaxes marcar叩nse hasta a execuci坦n\n"
 " si est叩 desactivado)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Di叩logo de recepci坦n"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Mostrar di叩logo de recepci坦n"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "Non mostrar di叩logo de erro si hai erros de recepci坦n"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Mostrar di叩logo de recepci坦n 坦 finalizar"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " Establecer atallos de teclado... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Comandos externos (%s se sustituir叩 con o nome de ficheiro / URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "Engadir direcci坦n 坦 destino con doble click"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "�� sair"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Confirmar 坦 sair"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "Baleirar papeleira 坦 sair"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Preguntar antes de baleirar"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensaxes na cola"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "o dia da semana abreviado"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "o dia da semana completo"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "o nome do mes abreviado"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "o nome do mes completo"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "a data e hora preferida para a localizaci坦n actual"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "o n炭mero de s辿culo (a単o/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mes como n炭mero decimal"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "a hora como n炭mero usando o reloxo de 24 horas"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "a hora como n炭mero usando o reloxo de 12 horas"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano como n炭mero decimal"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "o mes como n炭mero decimal"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "o minuto como n炭mero decimal"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "o segundo como n炭mero decimal"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como n炭mero decimal"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para a localizaci坦n actual"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "os dous 炭ltimos d鱈xitos do ano"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "o ano como n炭mero decimal"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria ou nome ou abreviatura"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Descripci坦n"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Cores do mensaxe"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Reutilizar cores de citaci坦n"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "Escoller cor para o nivel de citado 1"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "Escoller cor para o nivel de citado 2"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "Escoller cor para o nivel de citado 3"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "Escoller cor para URIs"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Descripci坦n de s鱈mbolos"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4954,11 +4967,11 @@ msgstr ""
 "Grupos de novas\n"
 "ID-Mensaxe"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Si x est叩, mostra expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4972,7 +4985,7 @@ msgstr ""
 "Corpo da mensaxe citado sen sinatura\n"
 "o car叩cter %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4984,15 +4997,15 @@ msgstr ""
 "Car叩cter chave aberta\n"
 "Car叩cter chave pechada"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Selecci坦n de fonte"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Atallos de teclado"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -5002,11 +5015,11 @@ msgstr ""
 "Se poden modificar tam辿n os atallos dos men炭s pulsando\n"
 "calquer tecla(s) 坦 situar o rat坦n sobre o elemento do men炭."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "Por defecto"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Antigos de Sylpheed"
 
@@ -5074,213 +5087,208 @@ msgstr "Preferencias de filtrado"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "多Quere borrar realmente esta regra?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Sen t鱈tulo"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Borrar regra"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "Borrar regra"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "cabeceiras ocultas"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "Cabeceira"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "Mensaxe"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "conten"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "non conten"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "Abaixo"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Copiar..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Non recibir"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "Borrar carpeta"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "Notas"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "Cores do mensaxe"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Marcar/Marcar como _le鱈do"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/Red_irixir"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "Executar"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "Carpeta"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "Enderezo"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "Cabeceira"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "Cabeceira"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "Cabeceira"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Non se estableceu o comando."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Non se especificou destinatario."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Non se estableceu o comando."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: o ficheiro non existe\n"
@@ -5536,57 +5544,57 @@ msgstr "Conectando"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando con o servidor SMTP: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 #, fuzzy
 msgid "Sending message..."
 msgstr "Enviando mensaxe"
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Terminando..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "Enviando mensaxe"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "Ocurriu un erro enviando as mensaxes."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5894,120 +5902,120 @@ msgstr "Non."
 msgid "Creating summary view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Queda algunha marca. 多Procesa-la?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Non hai mais mensaxes sin ler"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Non hai mensaxes sin ler. 多Buscar dende o final?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "Non hai mensaxes sin leer."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "Non hai mensaxes sen ler. 多Ir 叩 carpeta seguinte?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "B炭scar de novo"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "Non hai mais mensaxes novas"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Non hai mais mensaxes novas. 多Buscar dende o final?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "Non hai mensaxes novas."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "Non hai m叩is mensaxes novas. 多Ir a a carpeta seguinte?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Non hai mais mensaxes marcadas"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "Non hai mensaxes marcadas. 多Buscar dende o final?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "Non hai mensaxes marcadas."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non hai mensaxes marcadas. 多Buscar dende o principio?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Non hai mais mensaxes etiquetadas"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Non hai mensaxes etiquetadas. 多Buscar dende o final?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "Non hai mensaxes etiquetadas."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non hai mensaxes etiquetadas. 多Buscar dende o principio?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensaxes por asunto..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d non le鱈dos, %d totales (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d non le鱈dos, %d totales"
@@ -6179,6 +6187,9 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "fallo escribindo en %s.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Reconstruindo todos os arbores de carpetas..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_Ver/_Codificaci坦n/---"
 
diff --git a/po/hr.po b/po/hr.po
index 5462895e..7887c9e9 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+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"
@@ -63,11 +63,11 @@ msgstr ""
 "niste, pi邸ite ne Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, SAD."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "��itam konfiguracije za svaki ra��un...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -75,19 +75,19 @@ msgstr ""
 "Neki prozori za pisanje pisma su otvoreni.\n"
 "Molim, zatvorite sve prozore prije ure��ivanja ra��una."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Otvaram prozor za ure��ivanje ra��una...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Stvaram prozor za ure��ivanje ra��una...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Uredi ra��une"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -95,8 +95,8 @@ msgstr ""
 "Nove poruke biti ��e provjerene ovim redom. Ozna��ite pod\n"
 "S one ra��une s kojih 転elite skinuti po邸tu sa `Primi sve'."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -104,60 +104,66 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Poslu転itelj"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Uredi"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " Obri邸i "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Dolje"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Gore"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " Postavi kao uobi��ajeni ra��un "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "貼elite li usitinu obrisati ovaj ra��un?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Neimenovano"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Obri邸i ra��un"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "貼elite li usitinu obrisati ovaj ra��un?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Ne"
 
@@ -223,7 +229,7 @@ msgstr "Po邸alji"
 msgid "Abort"
 msgstr "O"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -233,11 +239,11 @@ msgstr ""
 "Unesite naredbu za ispis:\n"
 "(`%s' predstavlja datoteku)"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -247,7 +253,7 @@ msgstr ""
 "Unesite naredbu za ispis:\n"
 "(`%s' predstavlja datoteku)"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr ""
 
@@ -255,7 +261,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -342,8 +348,8 @@ msgstr "/_Adresa/_Uredi"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_bri邸i"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_Alati"
 
@@ -351,13 +357,13 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/_Pomo��"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/_Pomo��/_O"
 
@@ -374,10 +380,10 @@ msgid "/New _Folder"
 msgstr "/Novi _spis"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -396,17 +402,17 @@ msgstr "/_Obri邸i"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -568,7 +574,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Spis"
 
@@ -593,7 +599,7 @@ msgstr "Uobi��ajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -601,7 +607,7 @@ msgstr "Obavijest"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Gre邸ka"
 
@@ -613,31 +619,31 @@ msgstr "Stvaram su��elje za upozoravaju��i prozor...\n"
 msgid "Show this message next time"
 msgstr "Prika転i ovu poruku slijede��i put"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Naran��asta"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "Crvena"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Roza"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Nebesko plava"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Plava"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Zelena"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Sme��a"
 
@@ -645,7 +651,7 @@ msgstr "Sme��a"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Ni邸ta"
 
@@ -657,8 +663,8 @@ msgstr "/_Dodaj..."
 msgid "/_Remove"
 msgstr "/_Ukloni"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Postavke..."
@@ -830,8 +836,8 @@ msgstr "/_Pregled/_Znakovni standard"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
@@ -861,7 +867,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -944,144 +950,149 @@ msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:667
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/_Izvr邸i"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/_Alat"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi s _vanjskim ure��iva��em"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Izvr邸i"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti dio tekst\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Gre邸ka formata citata."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Gre邸ka poruke odgovori/proslijedi."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veli��inu datoteke %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "ne mogu kreirati %s\n"
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio vi邸edjelne poruke."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [Ure��eno]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Pisanje poruke%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Po邸alji"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1089,169 +1100,169 @@ msgstr ""
 "Ra��un za slanje po邸te nije definiran.\n"
 "Molim, odaberite ra��un prije slanja."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Do邸lo je do gre邸ke prilikom slanja poruke %s -u."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "ne mogu pisati zaglavlje\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "odla転em poruku...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "ne mogu odlo転iti poruku\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Veli��ina"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Po邸alji poruku"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Po邸alji kasnije"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "Odlo転i u spis odlo転eno i po邸alji kasnije"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Nedovr邸eno"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Spremi u spis nedovr邸eno"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Prilo転i"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Prilo転i datoteku"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Unesi potpis"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Ure��iva��"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Uredi s vanjskim ure��iva��em"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Sa転imanje"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "/_Uredi/Sa転mi sve duge _linije"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Pogre邸an MIME tip"
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za vanjski ure��iva�� je pogre邸na: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1262,73 +1273,73 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Uga邸ena grupa procesa: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Privremena datoteka: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Napi邸i: unos iz procesa motrenja\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Ne mogu pokrenuti vanjski ure��iva��\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Ne mogu pisati u datoteku\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "��itanje pipe-a nije uspjelo\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Ne mogu odlo転iti poruku."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Odbaci poruku"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Odbaci"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "u Nedovr邸eno"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 #, fuzzy
 msgid "Apply template"
 msgstr "Bri邸i obrazac"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 #, fuzzy
 msgid "Replace"
 msgstr "Obrazac"
@@ -1490,12 +1501,12 @@ msgstr "Uredi spis"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog spisa:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -1664,171 +1675,166 @@ msgstr "neuspjeh pri pisanju konfiguracije u datoteku\n"
 msgid "Select folder"
 msgstr "Odaberite spis"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Sandu��i��"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 #, fuzzy
 msgid "Sent"
 msgstr "Po邸alji"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Odlo転eno"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Sme��e"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 #, fuzzy
 msgid "Drafts"
 msgstr "Nedovr邸eno"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "NoviSpis"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne mo転e biti uklju��en u ime spisa."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Spis `%s' ve�� postoji."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu stvoriti spis `%s'."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi spis..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/_Preimenuj spis..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/_Obri邸i spis"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Isprazni sme��e"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 #, fuzzy
 msgid "/_Check for new messages"
 msgstr "Kreiranje nove po邸te"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/O_svje転i stablo spisa"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/_Tra転i poruka..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepro��itanih poruka."
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Pribilje転i se na _news grupu..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/Ukloni news _grupu"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Stvaram spisni pregled...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Nepro��itano"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Postavljam info spisa...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretra転ujem spise %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretra転ujem spis %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/O_svje転i stablo spisa"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Osvje転avam stablo spisa..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvje転avam stablo spisa..."
 
-#: src/folderview.c:732
-#, fuzzy
-msgid "Rebuilding all folder trees..."
-msgstr "Pretra転ujem sva stabla spisa..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Kreiranje nove po邸te"
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Spis %s je odabran\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "��aljem poruku"
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Do邸lo je do gre邸ke prilikom slanja poruke %s -u."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1838,16 +1844,16 @@ msgstr ""
 "(ukoliko 転elite stvoriti spis za pohranjivanje podspisa,\n"
 "dodajte `/' na kraju imena)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Preimenuj spis"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1856,24 +1862,24 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti ��e obrisane.\n"
 "貼elite li ih uistinu obrisati?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Obri邸i spis"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "Isprazni sme��e"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "Isprazniti sve poruke u sme��u?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1882,35 +1888,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NE��E biti obrisane s diska)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandu��i��"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 ra��un?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Obri邸i IMAP4 ra��un"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Obri邸i news grupu"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news ra��un?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Obri邸i news ra��un"
 
@@ -1958,7 +1964,7 @@ msgstr "nepoznato"
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne mogu prona��i listu news grupa."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Gotovo."
 
@@ -2257,7 +2263,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Postav"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "Slijede��a"
 
@@ -2353,7 +2359,7 @@ msgstr "Povezujem se na POP3 poslu転itelj: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 poslu転itelj: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
@@ -2383,7 +2389,7 @@ msgstr "Primam veli��inu poruka (LIST)..."
 msgid "Deleting message %d"
 msgstr "Bri邸em poruke"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Izlazim"
 
@@ -2427,7 +2433,8 @@ msgstr "Ne mogu pisati u datoteku.\n"
 msgid "Socket error."
 msgstr "protokol gre邸ka\n"
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2443,19 +2450,19 @@ msgid ""
 "%s"
 msgstr "Postavke sandu��i��a"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autorizacija"
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autorizacija"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr ""
 
@@ -2922,353 +2929,353 @@ msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_Pregled/Prika転i s_vo zaglavlje"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Po邸ta/Pre_Uredi"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Po邸ta/Primi po邸tu sa _svih ra��una"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Po邸ta/Primi po邸tu sa _svih ra��una"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Poruka/Po邸alji _kasnije"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Po邸ta/Pre_Uredi"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/_Po邸ta/Po邸alji _odlo転ene poruke"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_Po邸ta/Kreiraj _novu poruku"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_Po邸ta/O_dgovori"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Po邸ta/Odgovori svi_ma"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Po邸ta/Od_govori po邸iljatelju"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Po邸ta/Odgovori svi_ma"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/_Po邸ta/P_roslijedi"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Po邸ta/Proslijedi _kao prilog"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Po邸ta/Pre_Uredi"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_Po邸ta/Prem_jesti..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/_Po邸ta/Kopir_aj"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_Po邸ta/O_bri邸i"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_Po邸ta/O_zna��i"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Po邸ta/O_zna��i/_Ozna��i"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Po邸ta/O_zna��i/_Ukloni oznaku"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_Po邸ta/O_zna��i/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Po邸ta/O_zna��i/Ozna��i kao _nepro��itano"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Po邸ta/O_zna��i/Ozna��i kao _pro��itano"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Po邸ta/O_zna��i/Ozna��i sve _pro��itano"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/_Po邸ta/Pre_Uredi"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/Dod_aj po邸iljatelja u adresar"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Odr転avanje/_Filtriraj po邸tu"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Odr転avanje/_Filtriraj po邸tu"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Odr転avanje/_Filtriraj po邸tu"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Odr転avanje/_Filtriraj po邸tu"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Odr転avanje/_Filtriraj po邸tu"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Odr転avanje/_Filtriraj po邸tu"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Odr転avanje/_Filtriraj po邸tu"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Odr転avanje/_Obri邸i duplicirane poruke"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/_Izvr邸i"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/_Alat/Zapisni prozor"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_obi��ajene postavke..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Obrazac..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Uredi ra��une..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni ra��un..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Kreiraj _novi ra��un..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Uredi ra��une..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promjeni _trenutni ra��un"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_Pomo��/_Priru��nik"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomo��/_Priru��nik/_Engleski"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomo��/_Priru��nik/_Japanski"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/_Pomo��/_O"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomo��/_Priru��nik/_Engleski"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomo��/_Priru��nik/_Engleski"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomo��/_Priru��nik/_Engleski"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomo��/_Priru��nik/_Engleski"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_Pomo��/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Kreiram glavne prozore...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "ni邸ta"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni sme��e"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Isprazniti sve poruke u sme��u?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Dodaj sandu��i��"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3278,16 +3285,16 @@ msgstr ""
 "Ako je une邸en postoje��i sandu��i��, biti ��e\n"
 "automatski pretra転en."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandu��i�� `%s' ve�� postoji."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Sandu��i��"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3296,147 +3303,147 @@ msgstr ""
 "Kreiranje sandu��i��a propalo.\n"
 "Mo転da neke datoteke ve�� postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Od_govori"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor_i po邸iljatelju"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Prima novu po邸tu"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu po邸tu sa svih ra��una"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "��alje odlo転ene poruke"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Kreiraj"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Kreiranje nove po邸te"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Odgovara na poruku"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "Odgovori s."
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Proslijedi"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Proslje��uje poruku"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Bri邸e poruke"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Izvr邸i"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Izvr邸ava ozna��ene procese"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "Slijede��a nepro��itana poruka"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Postav"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 #, fuzzy
 msgid "Common preferences"
 msgstr "Uobi��ajene postavke"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Ra��un"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Postavke ra��una"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -3558,29 +3565,29 @@ msgstr "Kraj liste dosegnut; nastaviti od po��etka?"
 msgid "Search finished"
 msgstr "Potraga zavr邸ena"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Kreiram pregled poruka...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 #, fuzzy
 msgid "Attachments"
 msgstr "Prilog"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Ispi邸i"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3589,7 +3596,7 @@ msgstr ""
 "Unesite naredbu za ispis:\n"
 "(`%s' predstavlja datoteku)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4037,7 +4044,7 @@ msgstr "Primi sve poruke sa poslu転itelja"
 msgid "Receive size limit"
 msgstr ""
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr ""
 
@@ -4058,7 +4065,7 @@ msgstr "(Nefiltrirane poruke biti ��e spremljene u ovaj spis)"
 msgid "Authentication method"
 msgstr "Autorizacija"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr ""
 
@@ -4083,7 +4090,7 @@ msgstr "Generiraj ID poruke"
 msgid "Add user-defined header"
 msgstr "Dodatna zaglavlja"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Uredi... "
 
@@ -4546,30 +4553,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Pojednostavljeni Kineski (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalni Kineski (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalni Kineski (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kineski (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4578,462 +4590,462 @@ msgstr ""
 "Ako je `Automatski' odabrano, optimalni charset\n"
 "za locale ��e biti kori邸ten."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Sa転mi prije slanja"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Razdjelnik potpisa"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Ubaci automatski"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Automatski pokreni vanjski ure��iva��"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Sa転mi poruke na"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "znakova"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Sa転mi citat"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 #, fuzzy
 msgid "Wrap on input"
 msgstr "/_Uredi/Sa転mi sve duge _linije"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Sa転mi prije slanja"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "Automatski odaberi ra��un pri odgovaranju"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Citiraj poruku pri odgovaranju"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 #, fuzzy
 msgid "Reply button invokes mailing list reply"
 msgstr "/Odgovori svi_ma"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Format odgovora"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Oznaka citata"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Format proslje��ivanja"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Obja邸njenje simbola "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Font"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Prevedi ime zaglavlja (kao 邸to su `Od:' i `Tema:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Prika転i broj nepro��itanih poruka kraj imena spisa"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 #, fuzzy
 msgid "letters"
 msgstr "Obri邸i"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Pregled odr転avanja"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prika転i primatelja na `Od' ukoliko ste Vi autor"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Ra邸iri stablo"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Format datuma"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " Postavi pojedinosti prikaza... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Omogu��i poruke u boji"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Prika転i 2-byte abecedu i brojeve s 1-byte znakovima"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Prika転i zaglavlje iznad poruke"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Prika転i kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Razmak linija"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "pixel(a)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Pola stranice"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Miran scroll"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Prikaz postavki zaglavlja"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Automatski provjeri potpis"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Prika転i potpis u popup prozoru"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr ""
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 #, fuzzy
 msgid "Expired after"
 msgstr "Po邸alji kasnije"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 #, fuzzy
 msgid "minute(s) "
 msgstr "minuta"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Uhvati unos pri upisivanju lozinke"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prika転i upozorenje na startu ako GnuPG ne radi"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "poruka ne��e biti primljena\n"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Otvori prvu nepro��itanu poruku pri ulasku u spis"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 #, fuzzy
 msgid "Only mark message as read when opened in new window"
 msgstr "/_Po邸ta/O_tvori u novom prozoru"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "Idi u sandu��i�� nakon primanja po邸te"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Izvr邸i odmah pri premje邸tanju ili brisanju poruka"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Poruke ��e samo biti ozna��ene do izvr邸enja\n"
 " ako je ovo isklju��eno)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Prika転i dijalog primanja"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Prika転i dijalog primanja"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Uvijek"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Nikada"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr ""
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 #, fuzzy
 msgid "Close receive dialog when finished"
 msgstr "Prika転i dijalog primanja"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr ""
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, fuzzy, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Vanjski ure��iva�� (%s predstavlja ime datoteke)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "Dodaj adresu u destinaciju kada se dva put klikne"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "Na izlazu"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Potvrdi izlaz"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "Isprazni sme��e pri izlazu"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Pitaj prije pra転njenja"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Upozori ako ima odlo転enih poruka"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "pojednostavljeno ime tjedna"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "puno ime tjedna"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "skra��eno ime mjeseca"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "puno ime mjeseca"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "転eljeni datum i vrijeme za trenutni locale"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "broj stolje��a (godina/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "dan u mjesecu kao decimalni broj"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "sat kao decimalni broj koriste��i 24 satno vrijeme"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "sat kao decimalni broj koriste��i 12 satno vrijeme"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "dan u godini kao decimalni broj"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "mjesec kao decimalni broj"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "minute kao decimalni broj"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "AP ili PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "sekunde kao decimalni broj"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "dan u tjednu kao decimalni broj"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "転eljeni datum za trenutni locale"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "posljednje dvije znamenke godine"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "godina kao decimalni broj"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "vremenska zona"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Ozna��itelj"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "Primjer"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Postavi boje poruka"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Boje"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst - prvi stupanj"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst - drugi stupanj"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst - tre��i stupanj"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI poveznice"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Cikli��ki mijenjaj boje citata"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "Odaberite boju za citat 1. stupnja"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "Odaberite boju za citat 2. stupnja"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "Odaberite boju za citat 3. stupnja"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "Odaberite boju za URI"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Obaj邸njenje znakova"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -5057,11 +5069,11 @@ msgstr ""
 "News grupe\n"
 "ID poruke"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Ako je x odabrano, prikazuje expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5070,7 +5082,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5078,28 +5090,28 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Odabir fonta"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 #, fuzzy
 msgid "Key bindings"
 msgstr "��aljem"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 #, fuzzy
 msgid "Default"
 msgstr "Uobi��ajeni sandu��i��"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr ""
 
@@ -5167,213 +5179,208 @@ msgstr "Postavke filtera"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Uistinu obrisati pravilo?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Neimenovano"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Obri邸i pravilo"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "Obri邸i pravilo"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "Svo zaglavlje"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "Po邸ta"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "sadr転i"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "ne sadr転i"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "Pomakni dolje"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Kopiraj..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Ne primaj"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "Obri邸i spis"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "Bilje邸ke"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "Postavi boje poruka"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Ozna��i/Ozna��i kao _pro��itano"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/Pre-_uredi"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "Izvr邸i"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "Spis"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "Adresa"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Destinacija nije postavljena."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: datoteka ne postoji\n"
@@ -5632,60 +5639,60 @@ msgstr "Povezujem se"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Spajam se na SMTP poslu転itelj: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "��aljem MAIL FROM..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autorizacija"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 #, fuzzy
 msgid "Sending message..."
 msgstr "��aljem poruku"
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "��aljem MAIL FROM..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "��aljem MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "��aljem"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "��aljem RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "��aljem DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Zavr邸avam..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "��aljem poruku (%d / %d bytea)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "��aljem poruku"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "Do邸lo je do gre邸ke prilikom slanja poruke."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5999,125 +6006,125 @@ msgstr "Ne."
 msgid "Creating summary view...\n"
 msgstr "Kreiram pregled odr転avanja...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Izvr邸i oznaku"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Neke oznake su izostavljene. Izvr邸iti ih?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Pregledavam spis (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Nema nepro��itanih poruka"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Nema vi邸e nepro��itanih poruka. Tra転iti od kraja?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "Nema nepro��itanih poruka."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "Nema vi邸e nepro��itanih poruka. Nastaviti u slijede��i spis?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 #, fuzzy
 msgid "Search again"
 msgstr "Polje potrage"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 #, fuzzy
 msgid "No more new messages"
 msgstr "Nema nepro��itanih poruka"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "Nema vi邸e nepro��itanih poruka. Tra転iti od kraja?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 #, fuzzy
 msgid "No new messages."
 msgstr "Nema nepro��itanih poruka."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr "Nema vi邸e nepro��itanih poruka. Nastaviti u slijede��i spis?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Nema vi邸e ozna��enih poruka"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "Nema vi邸e ozna��enih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "Nema ozna��enih poruka."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema ozna��enih poruka. Tra転iti od po��etka?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Nema vi邸e label poruka"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema label poruka. Tra転iti od kraja?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "Nema label poruka."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema label poruka. Krenuti od po��etka?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Prihva��am poruke po temi..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premje邸teno"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepro��itanih, %d ukupno (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepro��itanih, %d ukupno"
@@ -6289,6 +6296,10 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "pisanje u %s nije uspjelo.\n"
 
+#, fuzzy
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Pretra転ujem sva stabla spisa..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_Pregled/_Znakovni standard/---"
 
diff --git a/po/hu.po b/po/hu.po
index 469d0248..b6586429 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: 2003-07-26 22:58-0100\n"
 "Last-Translator: Zahemszky G叩bor <Gabor@Zahemszky.HU>\n"
 "Language-Team: Hungarian <gnome-hu@gnome.org>\n"
@@ -65,11 +65,11 @@ msgstr ""
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. http://www."
 "fsf.org "
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Be叩ll鱈t叩sok beolvas叩sa az 旦sszes hozz叩f辿r辿shez...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -77,19 +77,19 @@ msgstr ""
 "N辿h叩ny szerkeszt�� ablak nyitva van.\n"
 "K辿rlek z叩rd be az ablakokat a hozz叩f辿r辿sek m坦dos鱈t叩sa el��tt!"
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Hozz叩f辿r辿sek szerkeszt��ablak叩nak megnyit叩sa...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Hozz叩f辿r辿sek szerkeszt��ablak叩nak l辿trehoz叩sa...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Hozz叩f辿r辿sek szerkeszt辿se"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -98,8 +98,8 @@ msgstr ""
 "let旦lt辿se'\n"
 "funkci坦 bekapcsol叩s叩hoz v叩laszd ki a 'G' oszlopban a jel旦l��dobozt!"
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -107,60 +107,66 @@ msgstr ""
 msgid "Name"
 msgstr "N辿v"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Szerver"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Hozz叩ad叩s"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Szerkeszt辿s"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " T旦rl辿s"
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Le"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Fel"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " Alap辿rtelmezett hozz叩f辿r辿sk辿nt be叩ll鱈t "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "T辿nyleg t旦r旦ljem ezt a hozz叩f辿r辿st?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "N辿vtelen"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Hozz叩f辿r辿s t旦rl辿se"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "T辿nyleg t旦r旦ljem ezt a hozz叩f辿r辿st?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Igen"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Nem"
 
@@ -230,7 +236,7 @@ msgstr " K端ld辿s"
 msgid "Abort"
 msgstr "Megszak鱈t叩s"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -241,11 +247,11 @@ msgstr ""
 "(`%%h' a param辿terrel helyettes鱈t��dik)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "A m撤velet rejtett felhaszn叩l坦i param辿tere"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -256,7 +262,7 @@ msgstr ""
 "(`%%u' a param辿terrel helyettes鱈t��dik)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "A m撤velet felhaszn叩l坦i param辿tere"
 
@@ -264,7 +270,7 @@ msgstr "A m撤velet felhaszn叩l坦i param辿tere"
 msgid "Add Address to Book"
 msgstr "C鱈m hozz叩ad叩sa a c鱈mlist叩hoz"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "C鱈m"
@@ -350,8 +356,8 @@ msgstr "/_C鱈m/_Szerkeszt辿s"
 msgid "/_Address/_Delete"
 msgstr "/_C鱈m/_T旦rl辿s"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_Eszk旦z旦k"
 
@@ -359,13 +365,13 @@ msgstr "/_Eszk旦z旦k"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszk旦z旦k/_LDIF f叩jl import"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/_Seg鱈ts辿g"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/_Seg鱈ts辿g/_N辿vjegy"
 
@@ -382,10 +388,10 @@ msgid "/New _Folder"
 msgstr "/��_j Mappa"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -404,17 +410,17 @@ msgstr "/_T旦rl辿s"
 msgid "E-Mail address"
 msgstr "E-Mail c鱈m"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "C鱈mjegyz辿k"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "N辿v:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -580,7 +586,7 @@ msgid "Group"
 msgstr "Csoport"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Mappa"
 
@@ -604,7 +610,7 @@ msgstr "��ltal叩nos c鱈m"
 msgid "Personal address"
 msgstr "Szem辿lyes c鱈m"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Megjegyz辿s"
 
@@ -612,7 +618,7 @@ msgstr "Megjegyz辿s"
 msgid "Warning"
 msgstr "Figyelmeztet辿s"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Hiba"
 
@@ -624,31 +630,31 @@ msgstr "Figyelmeztet��panel dial坦gus l辿trehoz叩sa...\n"
 msgid "Show this message next time"
 msgstr "Mutasd ezt az 端zenetet legk旦zelebb"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Narancs"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "V旦r旦s"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "R坦zsasz鱈n"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "��gsz鱈nk辿k"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "K辿k"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Z旦ld"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Barna"
 
@@ -656,7 +662,7 @@ msgstr "Barna"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Semmi"
 
@@ -668,8 +674,8 @@ msgstr "/_Hozz叩ad叩s..."
 msgid "/_Remove"
 msgstr "/_Elt叩vol鱈t叩s"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/_Tulajdons叩gok..."
 
@@ -834,8 +840,8 @@ msgstr "/_N辿zet/_V叩lasz"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_N辿zet/---"
 
@@ -862,7 +868,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -945,140 +951,145 @@ msgstr "/_N辿zet/_K坦dk辿szlet/Egyszer撤s鱈tett K鱈nai (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_N辿zet/_K坦dk辿szlet/Egyszer撤s鱈tett K鱈nai (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_N辿zet/_K坦dk辿szlet/Tradicion叩lis K鱈nai (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_N辿zet/_K坦dk辿szlet/Tradicion叩lis K鱈nai (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_N辿zet/_K坦dk辿szlet/Koreai (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_N辿zet/_K坦dk辿szlet/Thai (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_N辿zet/_K坦dk辿szlet/Thai (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_Eszk旦z旦k/_C鱈mjegyz辿k"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_Eszk旦z旦k/_Sablon"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszk旦z旦k/_Akci坦k"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_Eszk旦z旦k/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/__Szerkeszt辿s/Szerkeszt辿s _k端ls�� programmal"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Eszk旦z旦k/_Akci坦k"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_��zenet/_Titkos鱈t"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: f叩jl nem l辿tezik\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Nem tudtam olvasni a sz旦vegr辿szt\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Id辿zet jel旦l辿s form叩tum hiba."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "��zenet v叩lasz/tov叩bb鱈t叩s form叩tum hiba."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s f叩jl nem l辿tezik\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s m辿rete nem meghat叩rozhat坦\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "A %s f叩jl 端res."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvashat坦."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "��zenet: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Egy t旦bb r辿szes 端zenet egy darabja nem hozz叩f辿rhet��."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [Szerkesztett]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - ��zenet 鱈r叩sa%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "��zenet 鱈r叩sa%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Nincs c鱈mzett."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "K端ld辿s"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "A lev辿l t叩rgya 端res. Ennek ellen辿re elk端ld旦d?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "c鱈mzett lista nem hozz叩f辿rhet��."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1086,27 +1097,27 @@ msgstr ""
 "Nincs megadva hozz叩f辿r辿s a lev辿l k端ld辿shez.\n"
 "K辿rek v叩lassz ki egy hozz叩f辿r辿st k端ld辿s el��tt!"
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba l辿pett fel a %s-nak k端ldend�� 端zenet k端ld辿se k旦zben."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Az 端zenet nem menthet�� a kimen�� mapp叩ba."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nem tal叩ltam hozz叩rendelt kulcsot a kiv叩lasztott kulcs azonos鱈t坦hoz `%s'."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "f叩jl m坦dja nem v叩ltoztathat坦\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1116,140 +1127,140 @@ msgstr ""
 "%s-r坦l %s-ra.\n"
 "Elk端ldjem ennek ellen辿re?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "fejl辿c nem 鱈rhat坦\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "a r辿gi 端zenetet nem tudom elt叩vol鱈tani\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "端zenet a V叩rakoz坦 sorba...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "nem tal叩lom a V叩rakoz坦 sor mapp叩j叩t\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "Az 端zenetet nem siker端lt a V叩rakoz坦 sorba rakni\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gener叩lt ��zenet-azonos鱈t坦: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Szerkeszt��ablak l辿trehoz叩sa...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME t鱈pus"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "M辿ret"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Felad坦:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "��zenet k端ld辿se"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "K端ld辿s k辿s��bb"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "��zenet a V叩rakoz坦 sorba, k端ld辿s k辿s��bb"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "V叩zlat"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Ment辿s a v叩zlat mapp叩ba"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Besz炭r叩s"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "F叩jl besz炭r叩sa"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Csatol叩s"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "F叩jl csatol叩sa"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Al叩鱈r叩s"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Al叩鱈r叩s beilleszt辿se"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Szerkeszt��"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Szerkeszt辿s k端ls�� programmal"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Sort旦r辿s"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Az 旦sszes hossz炭 sor t旦r辿se"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "��rv辿nytelen MIME t鱈pus."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "A f叩jl nem l辿tezik vagy 端res."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "Tulajdons叩gok"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "K坦dol叩s"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "El辿r辿si 炭t"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "F叩jln辿v"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "K端ls�� szerkeszt�� parancssora 辿rv辿nytelen: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1260,72 +1271,72 @@ msgstr ""
 "Processz kil旦v辿se?\n"
 "processz csoport azonos鱈t坦: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "A le叩ll鱈tott processz csoport azonos鱈t坦ja: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ideiglenes f叩jl: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Szerkeszt辿s: bemenet a monitoroz坦 processzb��l\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "K端ls�� szerkeszt�� nem ind鱈that坦\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Nem tudok a f叩jlba 鱈rni\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Hiba t旦rt辿nt a cs��vezet辿k olvas叩sa k旦zben\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Az 端zenetet nem siker端lt a V叩rakoz坦 sorba rakni"
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "F叩jl v叩laszt叩s"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "F叩jl v叩laszt叩s"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "��zenet elvet辿se"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Az 端zenet megv叩ltozott. Eldobjam?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Elvet"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "v叩zlatok k旦z辿"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "T辿nyleg alkalmazni akarod a `%s' sablont?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Sablon alkalmaz叩sa"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Helyettes鱈t"
 
@@ -1486,12 +1497,12 @@ msgstr "Mappa szerkeszt辿se"
 msgid "Input the new name of folder:"
 msgstr "A mappa 炭j neve:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "��j mappa"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Az 炭j mappa neve:"
 
@@ -1661,163 +1672,159 @@ msgstr "a be叩ll鱈t叩sokat nem tudtam elmenteni\n"
 msgid "Select folder"
 msgstr "Mappa v叩laszt叩sa"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Bej旦v��"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Kimen��"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "V叩rakoz坦"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "V叩zlatok"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "��j mappa"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' nem tehet�� a mappan辿vbe."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' mappa m叩r l辿tezik."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' nem hozhat坦 l辿tre."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/��j _mappa l辿trehoz叩sa..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/Mappa 叩t_nevez辿se..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/Mappa _t旦rl辿se"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Kuka 端r鱈t辿se"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/��_j 端zenetek ellen��rz辿se"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/_Mappafa 炭jra辿p鱈t辿se"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/��_zenetek keres辿se..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nincs olvasatlan 端zenet.."
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/H鱈rcsoport _el��fizet辿se..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/H鱈rcsoport e_lt叩vol鱈t叩sa"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Mappa n辿zet l辿trehoz叩sa...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "��j"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Mappa inform叩ci坦 be叩ll鱈t叩sa...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Mappa inform叩ci坦 be叩ll鱈t叩sa..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa 叩tvizsg叩l叩sa..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa 叩tvizsg叩l叩sa..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "Mappafa 炭jra辿p鱈t辿se"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Mappafa 炭jra辿p鱈t辿se..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Mappafa 炭jra辿p鱈t辿se..."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Az 旦sszes mappafa 炭jra辿p鱈t辿se..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "��j 端zenetek keres辿se minden mapp叩ban..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s mappa kiv叩lasztva\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "��zenet k端ld辿se ..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hiba l辿pett fel a %s-nak k端ldend�� 端zenet k端ld辿se k旦zben."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1827,16 +1834,16 @@ msgstr ""
 "(Ha egy almapp叩kat tartalmaz坦 mapp叩t szeretn辿l l辿trehozni,\n"
 "akkor tegy辿l egy `/'-t a n辿v v辿g辿re)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "K辿rem `%s' 炭j nev辿t:"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Mappa 叩tnevez辿se"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1845,24 +1852,24 @@ msgstr ""
 "`%s' minden mapp叩ja 辿s 端zenete t旦rl��dik.\n"
 "T辿nyleg ezt akarod?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Mappa t旦rl辿se"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "`%s' nem t叩vol鱈that坦 el."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "Kuka 端r鱈t辿se"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "Minden 端zenet t旦rl辿se a kuk叩b坦l?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1871,34 +1878,34 @@ msgstr ""
 "`%s' postal叩d叩t t辿nyleg elt叩vol鱈tsam?\n"
 "(Az 端zenetek NEM t旦rl��dnek a meghajt坦r坦l)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Postal叩da elt叩vol鱈t叩sa"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "T辿nyleg t旦r旦ljem a(z) `%s' IMAP4 hozz叩f辿r辿st?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hozz叩f辿r辿s t旦rl辿se"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' h鱈rcsoportot t辿nyleg t旦r旦ljem?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "H鱈rcsoport t旦rl辿se"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' h鱈r hozz叩f辿r辿st t辿nyleg t旦r旦ljem?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "H鱈r hozz叩f辿r辿s t旦rl辿se"
 
@@ -1946,7 +1953,7 @@ msgstr "ismeretlen"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nem tudom olvasni a h鱈rcsoportok list叩j叩t."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "K辿sz."
 
@@ -2230,7 +2237,7 @@ msgstr "LDIF f叩jl import叩l叩sa a c鱈mjegyz辿kbe"
 msgid "Prev"
 msgstr "El��z��"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "K旦vetkez��"
 
@@ -2321,7 +2328,7 @@ msgstr "Kapcsol坦d叩s a %s POP3 szerverhez ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nem siker端lt kapcsol坦dni a POP3 szerverhez: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Azonos鱈t叩s..."
 
@@ -2351,7 +2358,7 @@ msgstr "��j 端zenetek m辿ret辿nek megszerz辿se (LIST)..."
 msgid "Deleting message %d"
 msgstr "��zenet t旦rl辿se %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Kil辿p辿s"
 
@@ -2394,7 +2401,8 @@ msgstr "Nem tudok a f叩jlba 鱈rni."
 msgid "Socket error."
 msgstr "Socket hiba."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "A t炭loldal bez叩rta a kapcsolatot."
 
@@ -2411,11 +2419,11 @@ msgstr ""
 "A postafi坦k z叩rolt:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "Az azonos鱈t叩s nem siker端lt."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2424,7 +2432,7 @@ msgstr ""
 "Az azonos鱈t叩s nem siker端lt:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 #, fuzzy
 msgid "Session timed out."
 msgstr "kapcsolat id��t炭ll辿p辿se\n"
@@ -2847,329 +2855,329 @@ msgstr "/_N辿zet/_K坦dk辿szlet/Jap叩n (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_N辿zet/_K坦dk辿szlet/Jap叩n (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_N辿zet/_K坦dk辿szlet/K鱈nai (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_N辿zet/_K坦dk辿szlet/Koreai (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_N辿zet/Me_gnyit叩s 炭j ablakban"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_N辿zet/��_zenet forr叩sa"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_N辿zet/_Minden fejl辿c megjelen鱈t辿se"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_N辿zet/��_sszegz辿s friss鱈t辿se"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_��zenet"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_��zenet/_Szerkeszt辿s 炭jra"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_��zenet/Fog_ad叩s minden hozz叩f辿r辿sr��l"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_��zenet/Fog_ad叩s minden hozz叩f辿r辿sr��l"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_��zenet/Fo_gad叩s megszak鱈t叩sa"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_��zenet/_Szerkeszt辿s 炭jra"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/_��zenet/��_zenetek k端ld辿se a V叩rakoz坦 sorb坦l"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_��zenet/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_��zenet/_��j 端zenet szerkeszt辿se"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_��zenet/V叩_lasz"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/_��zenet/_V叩lasz m叩snak"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_��zenet/V叩lasz _m叩snak/ _Mindenkinek"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_��zenet/V叩lasz _m叩snak/A _felad坦nak"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_��zenet/V叩lasz _m叩snak/_Levelez�� list叩nak"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/_��zenet/_Tov叩bb鱈t叩s"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/_��zenet/Tov叩bb鱈t叩s _csatol叩sk辿nt"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/_��zenet/��_tir叩ny鱈t"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_��zenet/M_ozgat叩s..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/_��zenet/_M叩sol叩s..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_��zenet/_T旦rl辿s"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_��zenet/_Megjel旦l"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_��zenet/_Megjel旦l/_Megjel旦l"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_��zenet/_Megjel旦l/Megjel旦l辿s visszavon叩sa"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_��zenet/_Megjel旦l/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_��zenet/_Megjel旦l/Mint olvasatla_n"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_��zenet/_Megjel旦l/Mint olvaso_tt"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_��zenet/_Megjel旦l/_Minden olvasottat"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/_��zenet/_Szerkeszt辿s 炭jra"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Eszk旦z旦k/_K端ld�� c鱈m辿t a c鱈mlist叩ba"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Eszk旦z旦k/��_zenetek sz撤r辿se"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Eszk旦z旦k/��_zenetek sz撤r辿se"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Eszk旦z旦k/_Sz撤r辿si szab叩lyok"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Eszk旦z旦k/_Sz撤r辿si szab叩lyok/_Automatikusan"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Eszk旦z旦k/_Sz撤r辿si szab叩lyok/_Felad坦 alapj叩n"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Eszk旦z旦k/_Sz撤r辿si szab叩lyok/_C鱈mzett alapj叩n"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Eszk旦z旦k/_Sz撤r辿si szab叩lyok/_T叩rgy alapj叩n"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Eszk旦z旦k/_Duplik叩lt levelek t旦rl辿se"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_Eszk旦z旦k/_Futtat叩s"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/_Eszk旦z旦k/_Napl坦 ablak"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Be叩ll鱈t叩sok"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Be叩ll鱈t叩sok/K旦z旦s _Be叩ll鱈t叩sok..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Be叩ll鱈t叩sok/_Sz撤r�� be叩ll鱈t叩sok..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_Be叩ll鱈t叩sok/_Sablon..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_Be叩ll鱈t叩sok/_Akci坦k..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Be叩ll鱈t叩sok/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Be叩ll鱈t叩sok/Aktu叩lis _hozz叩f辿r辿s be叩ll鱈t叩sai..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Be叩ll鱈t叩sok/_��j hozz叩f辿r辿s l辿trehoz叩sa..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Be叩ll鱈t叩sok/Hozz叩f辿r辿s _szerkeszt辿se..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Be叩ll鱈t叩sok/_Aktu叩lis hozz叩f辿r辿s v叩lt叩sa..."
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_Seg鱈ts辿g/_K辿zik旦nyv"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_Seg鱈ts辿g/K辿zik旦nyv/_Angol"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Seg鱈ts辿g/K辿zik旦nyv/_Jap叩n"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/_Seg鱈ts辿g/_GYIK"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Seg鱈ts辿g/_GYIK/_Angol"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Seg鱈ts辿g/_GYIK/_N辿met"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Seg鱈ts辿g/_GYIK/_Spanyol"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Seg鱈ts辿g/_GYIK/_Francia"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Seg鱈ts辿g/_GYIK/_Olasz"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_Seg鱈ts辿g/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "F��ablak l辿trehoz叩sa...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "F��ablak: %d sz鱈n foglal叩sa nem siker端lt\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "k辿sz.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "N辿vtelen"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "semmi"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Ablak elv叩laszt叩s t鱈pus v叩ltoztat叩sa %d-r坦l, %d-ra\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Kuka 端r鱈t辿se"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Minden 端zenet t旦rl辿se a kuk叩b坦l?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Postal叩da hozz叩ad叩sa"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3179,16 +3187,16 @@ msgstr ""
 "Ha m叩r l辿tezik a postal叩da, akkor\n"
 "automatikusan 叩tvizsg叩lom."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A `%s' postal叩da m叩r l辿tezik."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Postal叩da"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3197,144 +3205,144 @@ msgstr ""
 "A postal叩da l辿trehoz叩sa nem siker端lt.\n"
 "Tal叩n n辿h叩ny f叩jl m叩r l辿tezik, vagy nincs 鱈r叩si jogod."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappa n辿zet"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ��zenet n辿zet"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_V叩lasz"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "V叩lasz mindenkinek"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_V叩lasz m叩snak/a _felad坦nak"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_V叩lasz m叩snak/_levelez��list叩nak"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Tov叩bb鱈t叩s"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Csatol叩sk辿nt tov叩bb鱈t"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/��tir叩ny鱈_t"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Fogad叩s"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "��j E-mailek fogad叩sa"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Mind fogad叩sa"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "��j E-mail fogad叩sa minden hozz叩f辿r辿sen"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "V叩rakoz坦 sorb坦l 端zenet(ek) k端ld辿se"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Szerkeszt辿s"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "��j 端zenet szerkeszt辿se"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "V叩lasz"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "V叩lasz az 端zenetre"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "V叩lasz mindre"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "V叩lasz mindenkinek"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Tov叩bb鱈t"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "��zenet tov叩bb鱈t叩sa"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "��zenet t旦rl辿se"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Futtat叩s"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Megjel旦lt processz futtat叩sa"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "K旦vetkez�� olvasatlan 端zenet"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Be叩ll鱈t叩sok"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "K旦z旦s be叩ll鱈t叩sok"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Hozz叩f辿r辿s"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Hozz叩f辿r辿s be叩ll鱈t叩sok"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Kil辿p辿s"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Kil辿p辿s a programb坦l?"
 
@@ -3456,28 +3464,28 @@ msgstr "Az 端zenet v辿g辿re 辿rtem; folytassam az elej辿r��l?"
 msgid "Search finished"
 msgstr "Keres辿s befejez��d旦tt"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "��zenet n辿zet l辿trehoz叩sa...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Sz旦veg"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Csatol叩sok"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' f叩jlt nem tudom elmenteni."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Nyomtat叩s"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3486,7 +3494,7 @@ msgstr ""
 "K辿rem a nyomtat叩si parancsot:\n"
 "(`%s' hely辿re a f叩jln辿v ker端l)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3929,7 +3937,7 @@ msgstr "Minden 端zenet let旦lt辿se a szerverr��l"
 msgid "Receive size limit"
 msgstr "Fogadott lev辿l m辿retkorl叩t"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "KB"
 
@@ -3949,7 +3957,7 @@ msgstr "(A nem sz撤rt 端zenetek ebbe a mapp叩ba ker端lnek)"
 msgid "Authentication method"
 msgstr "Azonos鱈t叩si m坦dszer"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Automatikus"
 
@@ -3973,7 +3981,7 @@ msgstr "��zenet-azonos鱈t坦 gener叩l叩sa"
 msgid "Add user-defined header"
 msgstr "Felhaszn叩l坦 叩ltal defini叩lt fejl辿c hozz叩ad叩sa"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Szerkeszt辿s... "
 
@@ -4447,30 +4455,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Egyszer撤s鱈tett K鱈nai (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Egyszer撤s鱈tett K鱈nai (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicion叩lis K鱈nai (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicion叩lis K鱈nai (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "K鱈nai (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Koreai (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4479,11 +4492,11 @@ msgstr ""
 "Ha az `Automatikus' be van kapcsolva, akkor az optim叩lis k坦dol叩st\n"
 "haszn叩lom a helyi nyelvi be叩ll鱈t叩soknak megfelel��en."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "��tvitel k坦dol叩sa"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4492,118 +4505,118 @@ msgstr ""
 "Hat叩rozd meg a Content-Transfer-Encoding 辿rt辿k辿t\n"
 "ha az 端zenet tartalmaz nem-ASCII karaktereket is."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Al叩鱈r叩s elv叩laszt坦"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Automatikus beilleszt辿s"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "K端ls�� szerkeszt�� automatikus ind鱈t叩sa"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "Visszavon叩s m辿lys辿ge"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Sort旦r辿s helye"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "karakter"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Id辿zet t旦r辿se"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Bevitel t旦rdel辿se"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Sort旦rdel辿s k端ld辿s el��tt"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "Automatikus hozz叩f辿r辿s v叩laszt叩s v叩laszkor"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "��zenet id辿z辿se a v叩laszban"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "A `V叩lasz' gomb a `V叩lasz levelez�� list叩ra' funkci坦t hozza fel"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "V叩lasz form叩tuma"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Id辿zet jele"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Tov叩bb鱈t叩si form叩tuma"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Szimb坦lumok le鱈r叩sa "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Bet撤k辿szlet"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Fejl辿c ford鱈t叩sa (mint `Felad坦:', `T叩rgy:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Mappan辿v mellett az olvasatlan levelek sz叩m叩nak kijelz辿se"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "H鱈rcsoportok r旦vid鱈t辿se, ha hosszabb mint"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "lev辿l"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "��sszefoglal坦 n辿zet"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "C鱈mzett mutat叩sa a `Felad坦' oszlopban ha 旦nmagadnak k端ldted"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Folyam kifejt辿se"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "D叩tum form叩tuma"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " ��sszefoglal叩s kijelz辿s辿nek be叩ll鱈t叩sa... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Sz鱈nek haszn叩lata az 端zenetekhez"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4611,328 +4624,328 @@ msgstr ""
 "T旦bb byte-os karakterek 辿s sz叩mok megjelen鱈t辿se\n"
 "ASCII karakterekkel (csak jap叩n eset辿n)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Fejl辿cmez�� megjelen鱈t辿se az 端zenet f旦l旦tt"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "R旦vid fejl辿cek az 端zenet n辿zetben"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Sort叩vols叩g"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "K辿ppont"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "G旦rget辿s"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "F辿l oldal"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Finom g旦rget辿s"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "L辿p辿s"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "A csatolt k辿pek 叩tm辿retez辿se"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Fejl辿c be叩ll鱈t叩sok"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Digit叩lis al叩鱈r叩s automatikus ellen��rz辿se"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Al叩鱈r叩sellen��rz辿s eredm辿nye felbukkan坦 ablakban"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Jelmondat ideiglenes t叩rol叩sa a mem坦ri叩ban"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Lej叩r, ut叩n"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "perc"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "('0'-ra 叩ll鱈tva  a kapcsol坦d叩s teljes id��tartam叩ra\n"
 " t叩rolja a jelmondatot)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Bevitel elkap叩sa egy jelmondat bead叩sakor"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Figyelmeztet辿s indul叩skor, ha a GnuPG nem m撤k旦dik"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "Az 端zenetek mindig 旦sszefoglalva jelennek meg, ha ez kiv叩lasztott"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Mapp叩ba l辿p辿skor az els�� olvasatlan 端zenet megnyit叩sa"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "Csak az 炭j ablakban megnyitott 端zeneteket jel旦lje olvasottk辿nt."
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "V叩ltson a bej旦v�� postafi坦kra e-mail fogad叩s ut叩n"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Azonnali v辿grehajt叩s 端zenet mozgat叩s vagy t旦rl辿s eset辿n"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Az 端zenetek kijel旦lten l叩that坦k a feldolgoz叩skor,\n"
 " ha ez kikapcsolt 叩llapotban van)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Fogad坦 ablak"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Fogad坦 ablak mutat叩sa"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Mindig"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Soha"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne dobjon fel hibaablakot fogad叩si hiba eset辿n"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Fogad坦 ablak bez叩r叩sa ha v辿gzett"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " Billenty撤 hozz叩rendel辿sek... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "K端ls�� parancsok (%s hely辿re a f叩jln辿v / URI ker端l)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Web b旦ng辿sz��"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "Dupla-klikk eset辿n c鱈m a c辿lmez��be"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "Kil辿p辿skor"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Kil辿p辿skor r叩k辿rdez"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "Kuka 端r鱈t辿se kil辿p辿skor"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "��r鱈t辿s el��tt r叩k辿rdez"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Elk端ldetlen 端zenetek eset辿n figyelmeztet"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "H叩l坦zati adat叩tvitel id��t炭ll辿p辿s:"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "m叩sodperc"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "r旦vid鱈tett nap n辿v"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "teljes nap n辿v"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "r旦vid鱈tett h坦napn辿v"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "a teljes h坦napn辿v"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "aj叩nlott d叩tum- 辿s id��form叩tum a jelenlegi nyelvi be叩ll鱈t叩shoz"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "辿vsz叩zad (辿v/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "h坦nap napja sz叩mk辿nt"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "坦ra sz叩mk辿nt (24 坦r叩s kijelz辿s)"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "坦ra sz叩mk辿nt (12 坦r叩s kijelz辿s)"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "Az 辿v napja sz叩mk辿nt"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "h坦nap sz叩mk辿nt"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "perc sz叩mk辿nt"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "DE vagy DU"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "m叩sodperc sz叩mk辿nt"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "h辿t napja sz叩mk辿nt"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "aj叩nlott d叩tum az aktu叩lis nyelvi be叩ll鱈t叩shoz"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "az 辿vsz叩m utols坦 k辿t sz叩mjegye"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "辿v sz叩mk辿nt"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "id��z坦na vagy n辿v vagy r旦vid鱈t辿s"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Vez辿rl��jel"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Le鱈r叩s"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "P辿lda"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "��zenetsz鱈n be叩ll鱈t叩sa"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Sz鱈nek"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Id辿zett sz旦veg - els�� szint"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Id辿zett sz旦veg - m叩sodik szint"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Id辿zett sz旦veg - harmadik szint"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI-kapocs"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Id辿zet sz鱈neinek 炭jrahasznos鱈t叩sa"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "1. szint撤 id辿zet sz鱈ne"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "2. szint撤 id辿zet sz鱈ne"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "3. szint撤 id辿zet sz鱈ne"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "URI sz鱈ne"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Szimb坦lumok le鱈r叩sa"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4956,11 +4969,11 @@ msgstr ""
 "H鱈rcsoportok\n"
 "��zenet-azonos鱈t坦"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Ha x be叩ll鱈tva, akkor kifejez辿s megjelen鱈t辿se"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4974,7 +4987,7 @@ msgstr ""
 "Id辿zett 端zenet t旦rzs al叩鱈r叩s n辿lk端l\n"
 "Sz坦 szerint %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4986,15 +4999,15 @@ msgstr ""
 "Nyit坦 kapcsos z叩r坦jel\n"
 "Z叩r坦 kapcsos z叩r坦jel"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Bet撤t鱈pus v叩laszt叩s"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Billenty撤 hozz叩rendel辿sek"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -5004,11 +5017,11 @@ msgstr ""
 "M坦dos鱈thatod minden men端 gyorsbillenty撤j辿t, ha az eg辿rmutat坦val\n"
 "r叩mutatva megnyomod a k鱈v叩nt billenty撤t."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "Alap辿rtelmez辿s"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "R辿gi Sylpheed"
 
@@ -5076,213 +5089,208 @@ msgstr "Sz撤r�� be叩ll鱈t叩sa"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "T辿nyleg t旦r旦ljem ezt a szab叩lyt?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "N辿vtelen"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Szab叩ly t旦rl辿se"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "Szab叩ly t旦rl辿se"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "Rejtett fejl辿cek"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "Fejl辿c"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "��zenet"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "tartalmaz"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "nem tartalmaz"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "Mozgat叩s le"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/_M叩sol叩s..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Ne fogadjon"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "Mappa t旦rl辿se"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "Megjegyz辿sek"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "��zenetsz鱈n be叩ll鱈t叩sa"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Kijel旦l/_Olvasottk辿nt jel旦l"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Csatol叩sk辿nt tov叩bb鱈t"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/��tir叩ny鱈_t"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "Futtat叩s"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "Mappa"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "C鱈m"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "Fejl辿c"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "Fejl辿c"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "Fejl辿c"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Nincs c鱈mzett."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Nincs be叩ll鱈tva a parancssor."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Nincs c辿l be叩ll鱈tva."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Nincs be叩ll鱈tva a parancssor."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: f叩jl nem l辿tezik\n"
@@ -5538,56 +5546,56 @@ msgstr "Kapcsol坦d叩s"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Kapcsol坦d叩s %s SMTP szerverhez..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "HELO k端ld辿se..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "Azonos鱈t叩s"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "��zenet k端ld辿se ..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "EHLO k端ld辿se..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM k端ld辿se..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "K端ld辿s"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO k端ld辿se..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "DATA k端ld辿se..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Kil辿p辿s..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "��zenet k端ld辿se (%d / %d byte)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "��zenet k端ld辿se"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "Hiba t旦rt辿nt 端zenetk端ld辿s k旦zben."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5894,120 +5902,120 @@ msgstr "Db"
 msgid "Creating summary view...\n"
 msgstr "��ttekint�� n辿zet l辿trehoz叩sa...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Kijel旦ltek feldolgoz叩sa"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Maradt m辿g n辿h叩ny kijel旦lt. Feldolgozzam?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "(%s) mappa 叩tvizsg叩l叩sa..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Nincs tov叩bbi olvasatlan 端zenet"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Nem tal叩ltam olvasatlan 端zenetet. Keres辿s a v辿g辿r��l?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "Nincs olvasatlan 端zenet.."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "Nem tal叩ltam olvasatlan 端zenetet. Ugr叩s a k旦vetkez�� mapp叩ra?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "Keres辿s ism辿t"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "Nincs t旦bb 炭j 端zenet"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Nem tal叩ltam 炭j 端zenetet. Keres辿s a v辿g辿r��l?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "Nincs 炭j 端zenet."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "Nem tal叩ltam 炭j 端zenetet. Menjek a k旦vetkez�� mapp叩ra?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Nincs tov叩bbi kijel旦lt 端zenet"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "Nem tal叩ltam kijel旦lt 端zenetet. Keres辿s a v辿g辿r��l?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "Nincs kijel旦lt 端zenet."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nem tal叩ltam kijel旦lt 端zenetet. Keres辿s az elej辿r��l?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Nincs tov叩bbi c鱈mk辿zett 端zenet."
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Nem tal叩ltam c鱈mk辿zett 端zenetet. Keres辿s a v辿g辿r��l?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "Nincs c鱈mk辿zett 端zenet."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nem tal叩ltam c鱈mk辿zett 端zenetet. Keres辿s az elej辿r��l?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "��zenetek t叩rgy szerint..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d t旦r旦lve"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d mozgatva"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d m叩solva"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " darab kiv叩lasztva"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 炭j, %d olvasatlan, %d 旦sszesen (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 炭j, %d olvasatlan, %d 旦sszesen"
@@ -6179,6 +6187,9 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "%s f叩jlba nem siker端lt 鱈rni.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Az 旦sszes mappafa 炭jra辿p鱈t辿se..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_N辿zet/_K坦dk辿szlet/---"
 
diff --git a/po/it.po b/po/it.po
index f3aade71..53843d81 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 1.9.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: 2005-03-15 19:17+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -65,11 +65,11 @@ msgstr ""
 "insieme a questo programma; in caso contrario, scrivete alla Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Lettura della configurazione per ogni account...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -77,19 +77,19 @@ msgstr ""
 "Alcune finestre di composizione sono aperte.\n"
 "Chiudere tutte le finestre di composizione prima di modificare gli account."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Apertura della finestra di modifica dell'account...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Creazione della finestra di modifica dell'account...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Modifica degli account"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -99,8 +99,8 @@ msgstr ""
 "colonna 束G損 per consentire il recupero dei messaggi attraverso 束Ricevi "
 "tutti損."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -108,60 +108,66 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr " Aggiungi "
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr " Modifica "
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " Elimina "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Gi湛"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Su"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " Imposta come account predefinito "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Eliminare questo account?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Senza titolo"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Elimina account"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "Eliminare questo account?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "S狸"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+No"
 
@@ -230,7 +236,7 @@ msgstr " Invia "
 msgid "Abort"
 msgstr "Interrompi"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -241,11 +247,11 @@ msgstr ""
 "(束%%h損 verr�� sostituito con l'argomento)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "Argomento nascosto dell'azione utente"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -256,7 +262,7 @@ msgstr ""
 "(束%%u損 verr�� sostituito con l'argomento)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "Argomento dell'azione utente"
 
@@ -264,7 +270,7 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Indirizzo"
@@ -350,8 +356,8 @@ msgstr "/_Indirizzo/_Modifica"
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/S_trumenti"
 
@@ -359,13 +365,13 @@ msgstr "/S_trumenti"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
 
@@ -382,10 +388,10 @@ msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -404,17 +410,17 @@ msgstr "/Eli_mina"
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -585,7 +591,7 @@ msgid "Group"
 msgstr "Gruppo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Cartella"
 
@@ -609,7 +615,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Avviso"
 
@@ -617,7 +623,7 @@ msgstr "Avviso"
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Errore"
 
@@ -629,31 +635,31 @@ msgstr "Creazione della finestra di dialogo dell'allarme...\n"
 msgid "Show this message next time"
 msgstr "Mostra questo messaggio la prossima volta"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Arancio"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "Rosso"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Blu cielo"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Blu"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Verde"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Marrone"
 
@@ -661,7 +667,7 @@ msgstr "Marrone"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Niente"
 
@@ -673,8 +679,8 @@ msgstr "/_Aggiungi..."
 msgid "/_Remove"
 msgstr "/_Rimuovi"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/_Propriet��..."
 
@@ -834,8 +840,8 @@ msgstr "/_Visualizza/_Rispondi a"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
 
@@ -862,7 +868,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -945,137 +951,142 @@ msgstr "/_Visualizza/Co_difica/Cinese semplificato (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_Visualizza/Co_difica/Cinese semplificato (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visualizza/Co_difica/Cinese tradizionale (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visualizza/Co_difica/Cinese tradizionale (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visualizza/Co_difica/Coreano (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visualizza/Co_difica/Tailandese (TIS-_620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visualizza/Co_difica/Tailan_dese (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/S_trumenti/_Rubrica"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/S_trumenti/_Modello"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/S_trumenti/A_zioni"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/S_trumenti/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Strumenti/Modifica con l'_editor esterno"
 
-#: src/compose.c:674
+#: src/compose.c:676
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Strumenti/Firma P_GP"
 
-#: src/compose.c:675
+#: src/compose.c:677
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Strumenti/_Cifratura PGP"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Impossibile ricevere parte del testo\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s 竪 vuoto."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [Modificato]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composizione messaggio %s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Composizione messaggio %s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Il destinatario non 竪 specificato."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Invia"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto 竪 vuoto. Inviarlo comunque?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1083,28 +1094,28 @@ msgstr ""
 "Non 竪 specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Si 竪 verificato un errore durante l'invio del messaggio a %s ."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella 束Inviata損."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Impossibile trovare qualsiasi chiave associata con l'id chiave 束%s損 "
 "attualmente selezionato."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1113,140 +1124,140 @@ msgstr ""
 "Impossibile convertire la codifica del carattere del messaggio da %s a %s.\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "impossibile scrivere le intestazioni\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella 束Coda損\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Invia il messaggio"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Invia pi湛 tardi"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "Mette nella cartella 束Coda損 e invia pi湛 tardi"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Bozze"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Salva nella cartella 束Bozze損"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Inserisci"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Inserisce il file"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Allega"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Allega il file"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Firma"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Inserisce la firma"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Modifica con l'editor esterno"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "A capo riga"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Manda a capo tutte le righe lunghe"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o 竪 vuoto."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "Propriet��"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "La riga di comando per l'editor esterno non 竪 valida: 束%s損\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1257,71 +1268,71 @@ msgstr ""
 "Forzare la conclusione del processo?\n"
 "group id del processo: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Group id del processo terminato: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "File temporaneo: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Composizione: input da un processo di controllo\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Impossibile eseguire l'editor esterno\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Impossibile scrivere sul file\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Lettura dalla pipe fallita\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Scarta il messaggio"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Questo messaggio 竪 stato modificato. Scartarlo?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Scarta"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "nella cartella 束Bozze損"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello 束%s損 ?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Sostituisci"
 
@@ -1483,12 +1494,12 @@ msgstr "Modifica la cartella"
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -1658,160 +1669,156 @@ msgstr "la scrittura della configurazione sul file 竪 fallita\n"
 msgid "Select folder"
 msgstr "Selezione della cartella"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "In entrata"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Inviata"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Coda"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Cestino"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "Nuova cartella"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "束%c損 non pu嘆 essere incluso nel nome della cartella."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La cartella 束%s損 esiste gi��."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossibile creare la cartella 束%s損."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/Crea _nuova cartella..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/_Rinomina cartella..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/_Elimina cartella"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 msgid "/Empty _trash"
 msgstr "/Svuo_ta cestino"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/_Controllo nuovi messaggi"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/R_icostruisci l'albero cartella"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/Ricerca _messaggi..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 msgid "/Down_load"
 msgstr "/Sc_arica"
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Iscrizione newsgroup..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/_Rimuovi newsgroup..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Creazione della vista della cartella...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Nuovi"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Non letti"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "Tot."
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Impostazione delle informazioni della cartella...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "Ricostruisco l'albero della cartella"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'albero della cartella sar�� ricostruito. Continuo?"
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Sto ricostruendo l'albero della cartella..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 msgid "Rebuilding of the folder tree failed."
 msgstr "La ricostruzione delll'albero della cartella 竪 fallita."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Sto ricostruendo tutti gli alberi della cartella..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "La cartella %s 竪 selezionata\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sto scaricando i messaggi in %s ..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Si 竪 verificato un errore scaricando i messaggi in 束%s損."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1821,16 +1828,16 @@ msgstr ""
 "(se si vuole creare una catella per memorizzare sottocartelle,\n"
 " aggiungere 束/損 alla fine del nome)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Inserire il nuovo nome per 束%s損:"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Rinomina la cartella"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1839,24 +1846,24 @@ msgstr ""
 "Tutte le cartelle e i messaggi all'interno di 束%s損 saranno eliminati.\n"
 "Eliminare?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Impossibile rimuovere la cartella 束%s損."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1865,34 +1872,34 @@ msgstr ""
 "Rimuovere la casella postale 束%s損 ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 束%s損?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup 束%s損 ?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news 束%s損 ?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
@@ -1940,7 +1947,7 @@ msgstr "sconosciuto"
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossibile recuperare la lista dei newsgroup."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Fatto."
 
@@ -2223,7 +2230,7 @@ msgstr "Importazione del file LDIF nella rubrica"
 msgid "Prev"
 msgstr "Precedente"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "Successivo"
 
@@ -2313,7 +2320,7 @@ msgstr "Connessione al server POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Autenticazione..."
 
@@ -2343,7 +2350,7 @@ msgstr "Ricezione della dimensione dei messaggi (LIST)..."
 msgid "Deleting message %d"
 msgstr "Eliminazione del messaggio %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Esco"
 
@@ -2386,7 +2393,8 @@ msgstr "Impossibile scrivere il file."
 msgid "Socket error."
 msgstr "Errore del socket."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "Connessione chiusa dall'host remoto."
 
@@ -2403,11 +2411,11 @@ msgstr ""
 "La casella postale 竪 bloccata:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2416,7 +2424,7 @@ msgstr ""
 "Autenticazione fallita:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr "La sessione 竪 andata in timeout."
 
@@ -2830,320 +2838,320 @@ msgstr "/_Visualizza/Co_difica/Giapponese (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visualizza/Co_difica/Giapponese (S_hift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visualizza/Co_difica/Cinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visualizza/Co_difica/Corea_no (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Visualizza/Apri nuova _finestra"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_Visualizza/Sorgente messagg_io"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_Visualizza/Mostra intesta_zioni"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_Visualizza/A_ggiorna sommario"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/M_essaggio"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 msgid "/_Message/Recei_ve"
 msgstr "/M_essaggio/Rice_vi"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/M_essaggio/Rice_vi/Ricevi dall'a_ccount attuale"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/M_essaggio/Rice_vi/Ricevi da _tutti gli account"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/M_essaggio/Rice_vi/Cancella in rice_zione"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 msgid "/_Message/Recei_ve/---"
 msgstr "/M_essaggio/Rice_vi/---"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/M_essaggio/Invia messa_ggi accodati"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/M_essaggio/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/M_essaggio/Componi _nuovo messaggio"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/M_essaggio/_Rispondi"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/M_essaggio/Rispondi _a"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/M_essaggio/Rispondi _a/_tutti"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/M_essaggio/Rispondi _a/_mittente"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/M_essaggio/Rispondi _a/mailing _list"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/M_essaggio/_Inoltra"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/M_essaggio/Inoltra come a_llegato"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/M_essaggio/Rispe_disci"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/M_essaggio/Sp_osta..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "M_essaggio/_Copia..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/M_essaggio/Eli_mina"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/M_essaggio/_Segna"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/M_essaggio/_Segna/Segn_a"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/M_essaggio/_Segna/To_gli segno"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/M_essaggio/_Segna/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/M_essaggio/_Segna/Segna co_me non letto"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/M_essaggio/_Segna/Segna come _letto"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/M_essaggio/_Segna/Segna come tutti l_etti"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/M_essaggio/Rimodi_fica"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/S_trumenti/Aggiungi mittente alla ru_brica"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/S_trumenti/_Filtra tutti i messaggi nella cartella"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 msgid "/_Tools/Filter _selected messages"
 msgstr "/S_trumenti/Filtra i messaggi _selezionati"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/S_trumenti/_Crea regola per il filtro"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/S_trumenti/_Crea regola per il filtro/A_utomaticamente"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _Da"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _A"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/S_trumenti/_Crea regola per il filtro/con l'_Oggetto"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/S_trumenti/Elimina messaggi _duplicati"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/S_trumenti/Ese_gui"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/S_trumenti/Finestra di _log"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Configurazione"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configurazione/Preferenze _comuni..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configurazione/Configurazione _filtri..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_Configurazione/Mo_dello..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configurazione/_Azioni..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Configurazione/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configurazione/_Preferenze per l'account attuale..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configurazione/Crea _nuovo account..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configurazione/_Modifica account..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configurazione/Ca_mbia account attuale"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/A_iuto/_Manuale"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/A_iuto/_Manuale/Ingl_ese"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_iuto/_Manuale/_Giapponese"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/A_iuto/_FAQ"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_iuto/_FAQ/Ingl_ese"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_iuto/_FAQ/_Tedesco"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_iuto/_FAQ/_Spagnolo"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_iuto/_FAQ/_Francese"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_iuto/_FAQ/_Italiano"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/A_iuto/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Creazione della finestra principale...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d 竪 fallita.\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "niente"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambio del tipo di separazione della finestra da %d a %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr "Siete offline. Andare online?"
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 msgid "Empty all trash"
 msgstr "Svuota cestino"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 msgid "Empty messages in all trash?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Aggiunta di una casella postale"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3153,16 +3161,16 @@ msgstr ""
 "Se 竪 specificata una casella postale esistente, sar��\n"
 "esaminata automaticamente."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale 束%s損 esiste gi��."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3172,141 +3180,141 @@ msgstr ""
 "Pu嘆 darsi che esistano gi�� alcuni file, oppure non si ha il permesso di "
 "scrittura."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vista cartella"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 msgid "/Reply to _all"
 msgstr "/Rispondi a _tutti"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 msgid "/Reply to _sender"
 msgstr "/Rispondi _al mittente"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Ricevi"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Include la nuova posta"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Ricevi tutti"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "Include la nuova posta di tutti gli account"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Invia i messaggi accodati"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Componi"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Compone un nuovo messaggio"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Rispondi"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Risponde al messaggio"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "Rispondi tutti"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Risponde a tutti"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Inoltra"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Inoltra il messaggio"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Elimina il messaggio"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Esegui"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Esegue le operazioni segnate"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "Successivo messaggio non letto"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Preferenze"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "Preferenze comuni"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Impostazione dell'account"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
@@ -3428,28 +3436,28 @@ msgstr "Ho raggiunto la fine del messaggio; continuo dall'inizio?"
 msgid "Search finished"
 msgstr "Ricerca terminata"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Creazione della vista del messaggio...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Testo"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Allegati"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file 束%s損."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Stampa"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3458,7 +3466,7 @@ msgstr ""
 "Inserire la riga di comando per la stampa:\n"
 "(束%s損 verr�� sostituito col nome del file)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3896,7 +3904,7 @@ msgstr "Scarica tutti i messaggi sul server"
 msgid "Receive size limit"
 msgstr "Limite della dimensione da ricevere di"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "KB"
 
@@ -3916,7 +3924,7 @@ msgstr "(I messaggi non filtrati saranno memorizzati in questa cartella)"
 msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Automatico"
 
@@ -3940,7 +3948,7 @@ msgstr "Genera ID messaggio"
 msgid "Add user-defined header"
 msgstr "Aggiungi un'intestazione definita dall'utente"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Modifica... "
 
@@ -4413,30 +4421,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Cinese semplificato (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Cinese semplificato (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Cinese tradizionale (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Cinese tradizionale (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Cinese (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Tailandese (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Tailandese (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4444,11 +4457,11 @@ msgstr ""
 "Selezionando 束Automatico損 verr�� usata la codifica ottimale per la localit�� "
 "attuale."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "Codifica di trasferimento"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4456,118 +4469,118 @@ msgstr ""
 "Specificare il contenuto della codifica di trasferimento usata quando il "
 "corpo del messaggio contiene dei caratteri non-ASCII."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Separatore della firma"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Inserisci automaticamente"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Lancia automaticamente l'editor esterno"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "Livello di annulla"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Vai a capo nei messaggi dopo"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "caratteri"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "A capo nella citazione"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "A capo durante l'input"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "A capo prima dell'invio"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "Seleziona automaticamente l'account per le risposte"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Cita il messaggio quando rispondi"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "Il pulsante di risposta attiva la risposta alla mailing list"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Formato della risposta"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Simbolo di citazione"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Formato di inoltro"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Descrizione dei simboli "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Carattere"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traduci il nome dell'intestazione (come 束Da:損, 束Oggetto:損)"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Mostra il numero dei messaggi non letti vicino al nome della cartella"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "Accorcia i newsgroup pi湛 lunghi di"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "lettere"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Vista sommario"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Mostra il destinatario nella colonna 束Da損 se il mittente sei tu stesso"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Espandi i thread"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Formato della data"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " Imposta le voci visibili nel sommario... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Abilita la colorazione del messaggio"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4575,323 +4588,323 @@ msgstr ""
 "Mostra l'alfabeto e il numero multy-byte come\n"
 "carattere ASCII (solo Giapponese)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Mostra il riquadro intestazione sopra la vista messaggio"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Mostra le intestazioni abbreviate nella vista messaggio"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Spazio tra le righe"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "pixel"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Scorrimento"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Mezza pagina"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Scorrimento uniforme"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Passo"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr "Immagini"
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr "Ridimensiona le immagini allegate per adattarle nella finestra"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 msgid "Display images as inline"
 msgstr "Mostra immagini in linea"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Controlla automaticamente le firme"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Mostra il risultato del controllo della firma in una finestra di popup"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Conserva temporaneamente in memoria la phassphrase"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Scade dopo"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "minuto(i)"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Impostando a 束0損 si conserver�� la passphrase per l'intera sessione"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Nascondi l'input durante l'inserimento della passphrase"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostra un avvertimento alla partenza se GnuPG non 竪 attivo"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "Apri sempre i messaggi nel sommario quando selezionati"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Apri il primo messaggio non letto quando entri in una cartella"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Segna il messaggio come letto solo quando 竪 aperto in una nuova finestra"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "Vai a 束In entrata損 dopo la ricezione di nuova posta"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Esegui immediatamente quando sposti o elimini dei messaggi"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "I messaggi verranno solo segnati fino all'esecuzione se questa 竪 inattiva."
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Finestra di ricezione"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Mostra la finestra di ricezione"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr "Solo in ricezione manuale"
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Mai"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "Non mostrare la finestra di popup alla ricezione di un errore"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Chiudi la finestra di ricezione quando finito"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " Impostazione delle associazioni dei tasti... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr ""
 "Comandi esterni (gli %s verranno sostituiti con il nome del file / URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Browser web"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "Aggiungi l'indirizzo di destinazione con un doppio click"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "In uscita"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Chiedi la conferma all'uscita"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "Svuota il cestino all'uscita"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Chiedi prima di svuotare"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Avverti se ci sono messaggi accodati"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "Timeout del socket I/O:"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "secondo(i)"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "il nome abbreviato del giorno della settimana"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "il nome completo del giorno della settimana"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "il nome abbreviato del mese"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "il nome completo del mese"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "la data e l'ora preferite per la localit�� attuale"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "il numero del secolo (anno/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "il giorno del mese come numero decimale"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'ora come numero decimale con l'orologio di 24 ore"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'ora come numero decimale con l'orologio di 12 ore"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "il giorno dell'anno come numero decimale"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "il mese come numero decimale"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "i minuti come numero decimale"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "i secondi come numero decimale"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "il giorno della settimana come numero decimale"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "la data preferita per la localit�� attuale"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "le ultime due cifre dell'anno"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "l'anno come numero decimale"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "il fuso orario o l'abbreviazione"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Specificatore"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "Esempio"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Impostazione dei colori del messaggio"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Colori"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Testo citato - Primo livello"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Testo citato - Secondo livello"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Testo citato - Terzo livello"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "Link URI"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Ricicla i colori di citazione"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "Scelta del colore per la citazione di livello 1"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "Scelta del colore per la citazione di livello 2"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "Scelta del colore per la citazione di livello 3"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "Scelta del colore per l'URI"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Descrizione dei simboli"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4915,11 +4928,11 @@ msgstr ""
 "Newsgroups\n"
 "ID-Messaggio"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Se 竪 impostato x, mostra expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4933,7 +4946,7 @@ msgstr ""
 "Corpo del messaggio citato senza firma\n"
 "Percentuale"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4945,15 +4958,15 @@ msgstr ""
 "Parentesi graffa aperta\n"
 "Parentesi graffa chiusa"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Selezione del carattere"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Associazioni dei tasti"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4963,11 +4976,11 @@ msgstr ""
 "Si pu嘆 anche modificare ognuno dei tasti scorciatoia del men湛 premendo\n"
 "un(dei) tasto(i) quando il puntatore del mouse 竪 sulla voce del men湛."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "Predefinita"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Vecchio sylpheed"
 
@@ -5035,190 +5048,185 @@ msgstr "Impostazione dei filtri"
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Eliminare questa regola?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Senza titolo"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Elimina la regola"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 msgid "Filter rule"
 msgstr "Regola del filtro"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr "Se qualcuna delle seguenti condizioni corrisponde"
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr "Se tutte le seguenti condizioni corrispondono"
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr "Eseguire le seguenti azioni:"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr "A o Cc"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 msgid "Any header"
 msgstr "Qualsiasi intestazione"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 msgid "Edit header..."
 msgstr "Modifica intestazione..."
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 msgid "Message body"
 msgstr "Corpo messaggio"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr "Risultato del comando"
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr "Et��"
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "contiene"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 msgid "doesn't contain"
 msgstr "non contiene"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr "竪"
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr "non 竪"
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr "corrisponde alla esp.reg."
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr "non corrisponde alla esp. reg."
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr "竪 pi湛 grande di"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr "竪 pi湛 piccolo di"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr "竪 pi湛 lungo di"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr "竪 pi湛 corto di"
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Sposta in"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 msgid "Copy to"
 msgstr "Copia in"
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Non ricevere"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 msgid "Delete from server"
 msgstr "Elimina dal server"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 msgid "Set mark"
 msgstr "Imposta segno"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 msgid "Set color"
 msgstr "Imposta colore"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 msgid "Mark as read"
 msgstr "Segna come letto"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 msgid "Forward as attachment"
 msgstr "Inoltra come allegato"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 msgid "Redirect"
 msgstr "Rispedisci"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 msgid "Execute command"
 msgstr "Esegui comando"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr "Ferma valutazione regola"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 msgid "folder:"
 msgstr "cartella:"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 msgid "address:"
 msgstr "indirizzo:"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 msgid "Edit header list"
 msgstr "Modifica lista intestazione"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 msgid "Headers"
 msgstr "Intestazioni"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 msgid "Header:"
 msgstr "Intestazione:"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 msgid "Rule name is not specified."
 msgstr "Il nome della regola non 竪 specificato."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 msgid "Command is not specified."
 msgstr "Il comando non 竪 specificato."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr "Esiste una condizione non valida."
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 msgid "Destination folder is not specified."
 msgstr "La cartella di destinazione non 竪 specificata."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr "Esiste un'azione non valida."
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 msgid "Condition not exist."
 msgstr "La condizione non esiste."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 msgid "Action not exist."
 msgstr "L'azione non esiste."
 
@@ -5478,56 +5486,56 @@ msgstr "Connessione"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Connessione al server SMTP: %s..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "Invio di HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "Autenticazione"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "Invio del messaggio..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "Invio di EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "Invio di MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "Invio"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "Invio di RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "Invio di DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Esco..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Invio del messaggio (%d di %d byte)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "Invio del messaggio"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "Si 竪 verificato un errore durante l'invio del messaggio."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5832,122 +5840,122 @@ msgstr "No."
 msgid "Creating summary view...\n"
 msgstr "Creazione della vista del sommario...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Segno del processo"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Sono rimaste alcune operazioni segnate. Le elaboro?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Esame della cartella (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Non esistono pi湛 messaggi non letti"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Non 竪 stato trovato nessun messaggio non letto. Ricerco dalla fine?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "Non esistono messaggi non letti."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Non 竪 stato trovato nessun messaggio non letto. Passo alla cartella seguente?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "Ricerca ancora"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "Non esistono pi湛 messaggi nuovi"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Non 竪 stato trovato nessun messaggio nuovo. Ricerco dalla fine?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "Non esistono messaggi nuovi."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Non 竪 stato trovato nessun messaggio nuovo. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Non esistono pi湛 messaggi segnati"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "Non 竪 stato trovato nessun messaggio segnato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "Non esistono messaggi segnati."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non 竪 stato trovato nessun messaggio segnato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Non esistono pi湛 messaggi etichettati"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Non 竪 stato trovato nessun messaggio etichettato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "Non esistono messaggi etichettati."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non 竪 stato trovato nessun messaggio etichettato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Raggruppamento dei messaggi per oggetto..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d eliminato"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d spostato"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiato"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " voci selezionate"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuovi, %d non letti, %d totale (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuovi, %d non letti, %d totale"
@@ -6118,6 +6126,9 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "la scrittura su %s 竪 fallita.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Sto ricostruendo tutti gli alberi della cartella..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_Visualizza/Co_difica/---"
 
diff --git a/po/ja.po b/po/ja.po
index eb9223fe..24bf8d8a 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+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"
@@ -64,11 +64,11 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "�����鴻�������≪�������潟��罸����荐�絎����茯���粋昭��推賢...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -76,19 +76,19 @@ msgstr ""
 "��＜����祉�若�娯����������ｃ�潟����������������������障�����\n"
 "��≪�������潟�����膩���������������������鴻�������＜����祉�若�娯����������ｃ�潟��������������������������������"
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "��≪�������潟��膩���������ｃ�潟����������������������障��...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "��≪�������潟��膩���������ｃ�潟��������篏����筝�...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "��≪�������潟�����膩����"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -96,8 +96,8 @@ msgstr ""
 "��亥����＜����祉�若�吾����������������с����с�������������障��������������篆＜�������������＜����祉�若��\n"
 "������緇���������鴻��������������������G��������������������������鴻�������с��������������������������"
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -105,60 +105,65 @@ msgstr ""
 msgid "Name"
 msgstr "������"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "�����������潟��"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "��泣�若��"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "菴遵��"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "膩����"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr "  ������  "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "  ���  "
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "  ���  "
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " ���絽娯戎�����������≪�������潟��������絎� "
 
-#: src/account.c:757
+#: src/account.c:807
+#, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "���綵������≪�������潟�� '%s' ��������ゃ����������������с�����?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+msgid "(Untitled)"
+msgstr "(���腱井��荐�絎�)"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "��≪�������潟�����������"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "���綵������������≪�������潟����������ゃ����������������с�����?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "������"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+���������"
 
@@ -227,7 +232,7 @@ msgstr " ���篆� "
 msgid "Abort"
 msgstr "筝����"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -238,11 +243,11 @@ msgstr ""
 "(`%%h' ���綣���違�х舟�����������������障��)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "��≪����激�с�潟��筝����荀������若�九�����"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -253,7 +258,7 @@ msgstr ""
 "(`%%u' ���綣���違�х舟�����������������障��)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "��≪����激�с�潟�������若�九�����"
 
@@ -261,7 +266,7 @@ msgstr "��≪����激�с�潟�������若�九�����"
 msgid "Add Address to Book"
 msgstr "��≪�������鴻����≪�������劫験���菴遵��"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "��≪��������"
@@ -347,8 +352,8 @@ msgstr "/��≪��������(_A)/膩����(_E)"
 msgid "/_Address/_Delete"
 msgstr "/��≪��������(_A)/������(_D)"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/�����若��(_T)"
 
@@ -356,13 +361,13 @@ msgstr "/�����若��(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/�����若��(_T)/_LDIF�����＜�ゃ�������ゃ�潟����若��"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/���������(_H)"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/���������(_H)/��������������違����������ゃ�����(_A)"
 
@@ -379,10 +384,10 @@ msgid "/New _Folder"
 msgstr "/��域��������������(_F)"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -401,17 +406,17 @@ msgstr "/������(_D)"
 msgid "E-Mail address"
 msgstr "��糸����＜�若�� ��≪��������"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "��≪�������劫験"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "������:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -579,7 +584,7 @@ msgid "Group"
 msgstr "��違����若��"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "������������"
 
@@ -603,7 +608,7 @@ msgstr "��掩����≪��������"
 msgid "Personal address"
 msgstr "���篋榊����≪��������"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "羈����"
 
@@ -611,7 +616,7 @@ msgstr "羈����"
 msgid "Warning"
 msgstr "茘����"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "���������"
 
@@ -623,31 +628,31 @@ msgstr "茘������������������ゃ�≪����違��篏����筝�...\n"
 msgid "Show this message next time"
 msgstr "罨≦�������������＜����祉�若�吾��茵�腓冴�����"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "��������潟��"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "莎�"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "�����潟��"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "腥肴��"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "���"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "膩�"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "���"
 
@@ -655,7 +660,7 @@ msgstr "���"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "������"
 
@@ -667,8 +672,8 @@ msgstr "/菴遵��(_A)..."
 msgid "/_Remove"
 msgstr "/������(_R)"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/���������������(_P)..."
 
@@ -828,8 +833,8 @@ msgstr "/茵�腓�(_V)/菴�篆≦��������絎�(_R)"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/茵�腓�(_V)/---"
 
@@ -855,7 +860,7 @@ msgstr "/茵�腓�(_V)/���絖������潟�潟�若����ｃ�潟��(_E)/������(_A)"
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 msgid "/_View/Character _encoding/---"
 msgstr "/茵�腓�(_V)/���絖������潟�潟�若����ｃ�潟��(_E)/---"
@@ -921,133 +926,137 @@ msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/茵�腓�(_V)/���絖������潟�潟�若����ｃ�潟��(_E)/膂＞��絖�筝���処�� (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/茵�腓�(_V)/���絖������潟�潟�若����ｃ�潟��(_E)/膂＞��絖�筝���処�� (GBK)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/茵�腓�(_V)/���絖������潟�潟�若����ｃ�潟��(_E)/膵�篏�絖�筝���処�� (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/茵�腓�(_V)/���絖������潟�潟�若����ｃ�潟��(_E)/膵�篏�絖�筝���処�� (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/茵�腓�(_V)/���絖������潟�潟�若����ｃ�潟��(_E)/�����処�� (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/茵�腓�(_V)/���絖������潟�潟�若����ｃ�潟��(_E)/��帥�よ�� (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/茵�腓�(_V)/���絖������潟�潟�若����ｃ�潟��(_E)/��帥�よ�� (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/�����若��(_T)/��≪�������劫験(_A)"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/�����若��(_T)/�����潟�������若��(_T)"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/�����若��(_T)/��≪����激�с��(_N)"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/�����若��(_T)/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/�����若��(_T)/紊������������ｃ�帥�х隈���(_X)"
 
-#: src/compose.c:674
+#: src/compose.c:676
 msgid "/_Tools/PGP Si_gn"
 msgstr "/�����若��(_T)/PGP臀峨��(_G)"
 
-#: src/compose.c:675
+#: src/compose.c:677
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/�����若��(_T)/PGP����垸��(_E)"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: �����＜�ゃ�����絖���������障�����\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "��������鴻�������若��������緇���с����障�����\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "綣����膃������後�����筝�罩ｃ�с�����"
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "��＜����祉�若�吾��菴�篆�/荵∫�������後�����筝�罩ｃ�с�����"
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "�����＜�ゃ�� %s ���絖���������障�����\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "�����＜�ゃ�� %s �����泣�ゃ�冴�����緇���с����障�����\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "�����＜�ゃ�� %s ���腥冴�с�����"
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "%s ���茯���粋昭�����障��������"
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "��＜����祉�若��: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "��������������若����＜����祉�若�吾�������若��������緇���с����障��������"
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [��贋��]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - ��＜����祉�若�吾��篏����%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "��＜����祉�若�吾��篏����%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "絎����������絎���������������障��������"
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "���篆�"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "篁九�����腥冴�с��������������������篆＜����障�����?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "���篆≦����������鴻��������緇���с����障��������"
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1055,26 +1064,26 @@ msgstr ""
 "��＜�若��������篆＜����������������≪�������潟��������絎���������������障��������\n"
 "���篆＜�������������＜�若����≪�������潟�������御�����������������������"
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "��＜����祉�若�吾�� %s ��������鴻�����������筝������������若����榊�������障��������"
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "��＜����祉�若�吾�����篆≧ｧ���篆�絖���с����障��������"
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "�憜����御��������������������ID `%s' ���絲上����������泣��荀���ゃ�������障�������с��������"
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "�����＜�ゃ����≪�若�����紊���眼�с����障�����\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1083,140 +1092,140 @@ msgstr ""
 "��＜����祉�若�御�����������絖������潟�潟�若����ｃ�潟�違�� %s ������ %s ���紊������с����障��������\n"
 "%s �����障�障��������������篆＜����障�����?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "��������������吾��莨若����障��������\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "��ゃ����＜����祉�若�吾�������ゃ�с����障�����\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "��＜����祉�若�吾�����篆≦����＜����ャ����������障��...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "���篆≦����＜��������������荀���ゃ�������障�����\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "��＜����祉�若�吾�����篆≦��罘���с����障�����\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "�����������������＜����祉�若��ID: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "��＜����祉�若�娯����������ｃ�潟��������篏����筝�...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME ��帥�ゃ��"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "��泣�ゃ��"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "綏���坂査:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "��＜����祉�若�吾�����篆�"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "緇���ч��篆�"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "���篆≦����＜����������������ャ�����緇���ч��篆�"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "���腮�"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "���腮帥��������������篆�絖�"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "��水��"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "�����＜�ゃ�������水��"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "羞私��"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "�����＜�ゃ�����羞私��"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "臀峨��"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "臀峨�������水��"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "��������ｃ��"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "紊������������ｃ�帥�х隈���"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "��翫就"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "�����鴻�������激��茵����������菴����"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "��≦�鴻�� MIME ��帥�ゃ����с�����"
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "�����＜�ゃ�����絖������������������障�����腥冴�с�����"
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "���������������"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "�����潟�潟�若����ｃ�潟��"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "������"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "�����＜�ゃ�����"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "紊������������ｃ�帥����潟����潟�������ゃ�潟����≦�鴻�с��: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1227,71 +1236,71 @@ msgstr ""
 "��������祉�鴻��綣桁�句��篋������障�����?\n"
 "��������祉�鴻�違����若��ID: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "腟�篋���������������祉�鴻�違����若��ID: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "筝���������＜�ゃ��: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Compose: ��ｈ����������祉�鴻����������ュ��\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "紊������������ｃ�帥��絎�茵���с����障�����\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "�����＜�ゃ�������吾��莨若����障�����\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "�����ゃ�����茯���粋昭��帥��紊掩��\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "��＜����祉�若�吾�����篆≦��罘���с����障��������"
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 msgid "Select files"
 msgstr "�����＜�ゃ�������御��"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "�����＜�ゃ�������御��"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "��＜����祉�若�吾����贋��"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "��������＜����祉�若�吾��紊���眼�������������障�������贋�������障�����?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "��贋��"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "���腮帥��"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "�����潟�������若�� `%s' ��������������障�����?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "�����潟�������若�����������"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "臀����"
 
@@ -1452,12 +1461,12 @@ msgstr "���������������膩����"
 msgid "Input the new name of folder:"
 msgstr "�����������������違����������������ュ��������������������:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "��域��������������"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "��域����������������������������ュ��������������������:"
 
@@ -1626,160 +1635,156 @@ msgstr "荐�絎���������＜�ゃ����吾����吾��莨若�帥��紊掩�������障�����\n"
 msgid "Select folder"
 msgstr "�����������������御��"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "���篆∞��"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "���篆≧ｧ"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "���篆≦�����"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "�����睡��"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "���腮�"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "������������������ `%c' ��������������������с����障��������"
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "������������ `%s' ��������с��絖���������障�����"
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "������������ `%s' ���篏������с����障��������"
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/��域�����������������篏����(_N)..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/������������������紊����(_R)..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/���������������������(_D)"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 msgid "/Empty _trash"
 msgstr "/�����睡�宴��腥冴��������(_T)"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/��亥����＜����祉�若�吾�������с�����(_C)"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/��������������������若�����罕�膀�(_E)"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/��＜����祉�若�吾��罎�膣�(_S)..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 msgid "/Down_load"
 msgstr "/��������潟����若��(_L)"
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/�����ャ�若�鴻�違����若�����莖取��(_B)..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/�����ャ�若�鴻�違����若�����������(_R)"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "�����������������ャ�若��篏����筝�...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "��亥��"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "���茯�"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "膩����"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "�����������������宴��荐�絎�筝�...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "�����������������宴��荐�絎�筝�..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "�����������������鴻����ｃ�割賢 (%s%c%s) ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "�����������������鴻����ｃ�割賢 (%s)..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "��������������������若�����罕�膀�"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "��������������������若�����罕�膀������障�����膓������障�����?"
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "��������������������若�����罕�膀�筝�..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 msgid "Rebuilding of the folder tree failed."
 msgstr "��������������������若�����罕�膀����紊掩�������障��������"
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "�����������������������若�����罕�膀�筝�..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "��������������������亥����＜����祉�若�吾�������с�����筝�..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "������������ %s �����御����������障�����\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "%s 筝������＜����祉�若�吾����������潟����若��筝�..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "`%s' 筝������＜����祉�若�吾����������潟����若��筝������������若����榊�������障��������"
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1789,16 +1794,16 @@ msgstr ""
 "(��泣�������������������主�����������������������篏���������������翫��������\n"
 " ������������緇���� `/' ���菴遵��������������������)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' �����違����������������ュ��������������������:"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "������������������紊����"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1807,24 +1812,24 @@ msgstr ""
 "`%s' 篁ヤ����������������������＜����祉�若�吾�������鴻�������ゃ�������障�����\n"
 "���綵���������ゃ����������������с�����?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "���������������������"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "������������ `%s' ��������ゃ�с����障��������"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "�����睡�宴��腥冴��������"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "�����睡�宴��筝������＜����祉�若�吾�������鴻�������ゃ����障�����?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1833,34 +1838,34 @@ msgstr ""
 "���綵������＜�若�������������� `%s' ��������ゃ����障�����?\n"
 "(��＜����祉�若�吾�������ｃ�鴻����������������ゃ�������障�����)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "��＜�若�������������鴻��������"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "���綵����IMAP4��≪�������潟�� `%s' ��������ゃ����障�����?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "IMAP4��≪�������潟�����������"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "���綵���������ャ�若�鴻�違����若�� `%s' ��������ゃ����障�����?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "�����ャ�若�鴻�違����若�����������"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "���綵���������ャ�若�鴻�≪�������潟�� `%s' ��������ゃ����障�����?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "�����ャ�若�鴻�≪�������潟�����������"
 
@@ -1908,7 +1913,7 @@ msgstr "筝����"
 msgid "Can't retrieve newsgroup list."
 msgstr "�����ャ�若�鴻�違����若�������鴻��������緇���с����障��������"
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "絎�篋�."
 
@@ -2191,7 +2196,7 @@ msgstr "LDIF�����＜�ゃ�������≪�������劫験��吾�ゃ�潟����若��"
 msgid "Prev"
 msgstr "������"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "罨＜��"
 
@@ -2281,7 +2286,7 @@ msgstr "POP3��泣�若��: %s ����･膓�筝�..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3��泣�若��: %s:%d ����･膓���с����障�����\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "茯�荐寂賢..."
 
@@ -2311,7 +2316,7 @@ msgstr "��＜����祉�若�吾����泣�ゃ�冴�����緇�筝� (LIST)..."
 msgid "Deleting message %d"
 msgstr "��＜����祉�若�� %d ��������や賢"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "������筝�"
 
@@ -2354,7 +2359,8 @@ msgstr "�����＜�ゃ�������吾��莨若����障��������"
 msgid "Socket error."
 msgstr "��純�宴�������������若�с�����"
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "�����≪�若�������鴻����������ｃ���･膓������������������障��������"
 
@@ -2371,11 +2377,11 @@ msgstr ""
 "��＜�若�������������鴻�������������������������障��:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "茯�荐若��紊掩�������障��������"
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2384,7 +2390,7 @@ msgstr ""
 "茯�荐若��紊掩�������障�����:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr "��祉����激�с�潟����帥�ゃ����≪����������障��������"
 
@@ -2795,318 +2801,318 @@ msgstr "/茵�腓�(_V)/���絖������潟�潟�若����ｃ�潟��(_E)/��ユ��茯� (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/茵�腓�(_V)/���絖������潟�潟�若����ｃ�潟��(_E)/��ユ��茯� (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/茵�腓�(_V)/���絖������潟�潟�若����ｃ�潟��(_E)/筝���処�� (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/茵�腓�(_V)/���絖������潟�潟�若����ｃ�潟��(_E)/�����処�� (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/茵�腓�(_V)/��違����������ｃ�潟�������ч�����(_W)"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/茵�腓�(_V)/��＜����祉�若�吾����純�若��(_A)"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/茵�腓�(_V)/�����鴻�����������������茵�腓�(_H)"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/茵�腓�(_V)/��泣����������贋��(_U)"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/��＜����祉�若��(_M)"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 msgid "/_Message/Recei_ve"
 msgstr "/��＜����祉�若��(_M)/���篆�(_V)"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/��＜����祉�若��(_M)/���篆�(_V)/�憜�������≪�������潟�����������篆�(_C)"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/��＜����祉�若��(_M)/���篆�(_V)/�����≪�������潟�����������篆�(_A)"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/��＜����祉�若��(_M)/���篆�(_V)/���篆＜��筝�罩�(_G)"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 msgid "/_Message/Recei_ve/---"
 msgstr "/��＜����祉�若��(_M)/���篆�(_V)/---"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/��＜����祉�若��(_M)/���篆≦��罘�筝������＜����祉�若�吾�����篆�(_S)"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/��＜����祉�若��(_M)/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/��＜����祉�若��(_M)/��域����＜����祉�若�吾��篏����(_N)"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/��＜����祉�若��(_M)/菴�篆�(_R)"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/��＜����祉�若��(_M)/菴�篆＜��絎����(_Y)"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/��＜����祉�若��(_M)/菴�篆＜��絎����(_Y)/�����＜��菴�篆�(_A)"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/��＜����祉�若��(_M)/菴�篆＜��絎����(_Y)/綏���坂査���菴�篆�(_S)"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/��＜����祉�若��(_M)/菴�篆＜��絎����(_Y)/��＜�若����潟�違����鴻�����菴�篆�(_L)"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/��＜����祉�若��(_M)/荵∫��(_F)"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/��＜����祉�若��(_M)/羞私�����������荵∫��(_W)"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/��＜����祉�若��(_M)/������������������荵∫��(_T)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/��＜����祉�若��(_M)/腱糸��(_O)..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/��＜����祉�若��(_M)/��潟�����(_C)..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/��＜����祉�若��(_M)/������(_D)"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/��＜����祉�若��(_M)/�����若��(_M)"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/��＜����祉�若��(_M)/�����若��(_M)/�����若��(_M)"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/��＜����祉�若��(_M)/�����若��(_M)/�����若��茹ｉ��(_U)"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/��＜����祉�若��(_M)/�����若��(_M)/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/��＜����祉�若��(_M)/�����若��(_M)/���茯���������������若��(_E)"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/��＜����祉�若��(_M)/�����若��(_M)/茯����������������������(_D)"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/��＜����祉�若��(_M)/�����若��(_M)/�����鴻��茯����������������������(_R)"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/��＜����祉�若��(_M)/���膩����(_E)"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/�����若��(_T)/綏���坂査�����≪�������劫験���菴遵��(_K)"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/�����若��(_T)/������������筝���������鴻�������＜����祉�若�吾��������������(_F)"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 msgid "/_Tools/Filter _selected messages"
 msgstr "/�����若��(_T)/��御��筝������＜����祉�若�吾��������������(_F)"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/�����若��(_T)/�����������������若�����篏����(_C)"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/�����若��(_T)/�����������������若�����篏����(_C)/������(_A)"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/�����若��(_T)/�����������������若�����篏����(_C)/_From������"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/�����若��(_T)/�����������������若�����篏����(_C)/_To������"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/�����若��(_T)/�����������������若�����篏����(_C)/_Subject������"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/��＜����祉�若��(_M)/���茲���＜����祉�若�吾��������(_P)"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/�����若��(_T)/絎�茵�(_X)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/�����若��(_T)/�����違����ｃ�潟�����(_L)"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/荐�絎�(_C)"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/荐�絎�(_C)/���������荐�絎�(_C)..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/荐�絎�(_C)/���������������荐�絎�(_F)..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/荐�絎�(_C)/�����潟�������若��(_T)..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/荐�絎�(_C)/��≪����激�с��(_A)..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/荐�絎�(_C)/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/荐�絎�(_C)/�憜�������≪�������潟�����荐�絎�(_P)..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/荐�絎�(_C)/��域����≪�������潟�����篏����(_N)..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/荐�絎�(_C)/��≪�������潟�����膩����(_E)..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/荐�絎�(_C)/�憜�������≪�������潟�����紊����(_H)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/���������(_H)/��������ャ�≪��(_M)"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/���������(_H)/��������ャ�≪��(_M)/��沿��(_E)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/���������(_H)/��������ャ�≪��(_M)/��ユ��茯�(_J)"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/���������(_H)/_FAQ"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/���������(_H)/_FAQ/��沿��(_E)"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/���������(_H)/_FAQ/�����ゃ��茯�(_G)"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/���������(_H)/_FAQ/��鴻����ゃ�活��(_S)"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/���������(_H)/_FAQ/��������潟�壕��(_F)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/���������(_H)/_FAQ/��ゃ�帥����∵��(_I)"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/���������(_H)/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "��＜�ゃ�潟����ｃ�潟��������篏����筝�...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: ��蚊����蚊��綵���� %d ���紊掩�������障�����\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "絎�篋����\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "���腱井��荐�絎�"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "������"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "�����ｃ�潟�������������≪�帥�ゃ����� %d ������ %d ���紊���眼����������障��\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr "�����������ゃ��"
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr "�憜�������������ゃ�潟�с����������潟����ゃ�潟�������障�����?"
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 msgid "Empty all trash"
 msgstr "�����鴻����������睡�宴��腥冴��������"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 msgid "Empty messages in all trash?"
 msgstr "�����鴻����������睡�宴��筝������＜����祉�若�吾�������ゃ����障�����?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "��＜�若�������������鴻��菴遵��"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3115,16 +3121,16 @@ msgstr ""
 "��＜�若�������������鴻��篏�臀������ュ�����������������������\n"
 "��√�������＜�若�������������鴻�����絎������������������������鴻����ｃ�潟����障�����"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "��＜�若�������������� `%s' ��������с��絖���������障�����"
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "��＜�若��膊�"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3133,141 +3139,141 @@ msgstr ""
 "��＜�若�������������鴻��篏�������紊掩�������障��������\n"
 "��������ゃ����������＜�ゃ����������с��絖������������������������������吾��莨若��罔���������������障��������"
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - �����������������ャ��"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ��＜����祉�若�吾����ャ��"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/菴�篆�(_R)"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 msgid "/Reply to _all"
 msgstr "/�����＜��菴�篆�(_A)"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 msgid "/Reply to _sender"
 msgstr "/綏���坂査���菴�篆�(_S)"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 msgid "/Reply to mailing _list"
 msgstr "/��＜�若����潟�違����鴻�����菴�篆�(_L)"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/荵∫��(_F)"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/羞私�����������荵∫��(_W)"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/������������������荵∫��(_T)"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "���篆�"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "��亥����＜�若��������莨�"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "������篆�"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "�����≪�������潟�������亥����＜�若��������莨�"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "���篆≦��罘�筝������＜����祉�若�吾�����篆＜�����"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "篏����"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "��域����＜����祉�若�吾��篏����"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "菴�篆�"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "��＜����祉�若�吾��菴�篆＜�����"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "�����＜��菴�篆�"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "�����＜��菴�篆�"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "荵∫��"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "��＜����祉�若�吾��荵∫��������"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "��＜����祉�若�吾�������ゃ�����"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "絎�茵�"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "�����若��������������������絎�茵�"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "罨＜�����茯���＜����祉�若��"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "荐�絎�"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "���������荐�絎�"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "��≪�������潟��"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "��≪�������潟�����荐�絎�"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr "�憜�������������ゃ�潟�с�������≪�ゃ�潟�潟����������������������������潟����ゃ�潟����������障�����"
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr "�憜�������潟����ゃ�潟�с�������≪�ゃ�潟�潟����������������������������������ゃ�潟����������障�����"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "腟�篋�"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "��������������違��������腟�篋������障�����?"
 
@@ -3389,28 +3395,28 @@ msgstr "��＜����祉�若�吾��腟���������障�ф��膣≪����障��������紮����������罎�膣�
 msgid "Search finished"
 msgstr "罎�膣√��篋�"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "��＜����祉�若�吾����ャ�若��篏����筝�...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "��������鴻��"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "羞私��"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "�����＜�ゃ�� `%s' ���篆�絖���с����障��������"
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "��医��"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3419,7 +3425,7 @@ msgstr ""
 "��医�激�潟����潟�������ュ��������������������:\n"
 "(`%s' ��������＜�ゃ�������х舟�����������������障��)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3856,7 +3862,7 @@ msgstr "��泣�若��筝���������鴻�������＜����祉�若�吾�����篆＜�����"
 msgid "Receive size limit"
 msgstr "���篆＜�泣�ゃ�阪�狗��"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "KB"
 
@@ -3876,7 +3882,7 @@ msgstr "(��������������������������＜����祉�若�吾�������������������������主����
 msgid "Authentication method"
 msgstr "茯�荐惹�劫��"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "������"
 
@@ -3900,7 +3906,7 @@ msgstr "��＜����祉�若��ID���������������"
 msgid "Add user-defined header"
 msgstr "�����若�九��臂����������������菴遵��������"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " 膩����... "
 
@@ -4370,30 +4376,34 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "膂＞��絖�筝���処�� (GB2312)"
 
 #: src/prefs_common.c:1162
+msgid "Simplified Chinese (GBK)"
+msgstr "膂＞��絖�筝���処�� (GBK)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "膵�篏�絖�筝���処�� (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "膵�篏�絖�筝���処�� (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "筝���処�� (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "�����処�� (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "��帥�よ�� (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "��帥�よ�� (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -4401,11 +4411,11 @@ msgstr ""
 "���������荐�絎���������御����������翫���������憜�����荐�茯�荐�絎������������������潟�潟�若����ｃ�潟�違��篏睡�����"
 "�����障�����"
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "荵∫��膃��垸����劫��"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
@@ -4413,438 +4423,438 @@ msgstr ""
 "��＜����祉�若�御�������� ASCII ���絖�篁ュ�������������翫�����篏睡�������� Content-Transfer-"
 "Encoding ������絎����������������������"
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "臀峨�������阪�����"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "��������������水�ャ�����"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "紊������������ｃ�帥��������������莎桁��������"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "��≪�潟����ャ��������"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "��＜����祉�若�吾�����茹�"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "���絖���ф�壕��"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "綣������������������翫就������"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "��ュ����������������翫就������"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "���篆≧�������������翫就������"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "菴�篆≧�������������������≪�������潟�������御��������"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "菴�篆≧�������＜����祉�若�吾��綣����������"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "菴�篆＜����帥�潟�с�＜�若����潟�違����鴻�����菴�篆＜�����"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "菴�篆＜����後��"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "綣����膃�"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "荵∫�������後��"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " 荐��垩��茯���� "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "��������潟��"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "���������������������膺肢┳������ (箴������� `From:', `Subject:' 膈�)"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "������������������罔�������茯���違��茵�腓冴�����"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "���絖���違��"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "絖���������激�������ャ�若�鴻�違����若��������膂∞�ヨ；腓�"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "��泣����������ャ��"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "綏���坂査��������������翫����� `綏���坂査' ������������絎�������茵�腓冴�����"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "��鴻�����������絮����������"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "��ヤ�������後��"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " ��泣��������茵�腓咲��������荐�絎�... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "��＜����祉�若�吾����蚊�������鴻��������"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "��������������ゃ����掩�医����� ASCII ���絖���ц；腓冴����� (��ユ��茯�������)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "��＜����祉�若�吾����ャ�若��筝���������������������ゃ�潟��茵�腓冴�����"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "��＜����祉�若�吾����ャ�若��膂∞�ャ�����������茵�腓冴�����"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr "HTML ��＜����祉�若�吾��茹ｉ����������������鴻��茵�腓冴�����"
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "茵�������腥冴�����"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "��������祉��"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "��鴻�������若��"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "��������若�後��篏�"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "��鴻����若�冴�鴻�������若��"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "������"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr "��糸��"
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr "紊с�����羞私����糸����������ｃ�潟�������������������������泣�ゃ�冴�����"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 msgid "Display images as inline"
 msgstr "��糸�������ゃ�潟����ゃ�潟�ц；腓冴�����"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "臀峨�����������������罎�荐若�����"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "臀峨�����罎�荐主�������������������≪����������ｃ�潟�������ц；腓冴�����"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "�����鴻�������若�冴����＜�≪��筝����筝����������荐���吟�����"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "�����号�����"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "���"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "'0' ���荐�絎������������祉����激�с�潟�����筝������鴻�������若�冴��荐���吟����障�����"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "�����鴻�������若�冴����ュ����������ュ�����������������"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG ������篏������������翫��莎桁��������茘�������茵�腓冴�����"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "��泣�������с�＜����祉�若�吾����御��������������絽吾��������"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "�����������������ャ�ｃ�����������������������茯���＜����祉�若�吾��������"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "��域�������ｃ�潟�������ч�������������������帥�＜����祉�若�吾����∵����������������若��"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "��亥����＜�若��������篆＜�����緇����篆∞�宴��腱糸��������"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "��＜����祉�若�吾��腱糸����障����������ゃ����������喝婚���絎�茵�������"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "�����������≦�鴻����������������＜����祉�若�吾��絎�茵������������障�с����若�������������倶�������������障�����"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "���篆＜����ゃ�≪�����"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "���篆＜����ゃ�≪����違��"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "絽吾��茵�腓�"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr "��������у��篆＜�������翫�������粋；腓�"
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "茵�腓冴��������"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "���篆＜�������惹�������������若����ゃ�≪����違�������������≪��������������"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "絎�篋����������篆＜����ゃ�≪����違�����������"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " �����若����ゃ�潟�����荐�絎�... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "紊������潟����潟�� (%s ��������＜�ゃ��������URI��х舟�����������������障��)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Web������������"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "��������������������������������������≪�������鴻��絎�������菴遵��������"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "腟�篋����"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "腟�篋�������腆肴��������"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "腟�篋������������睡�宴��腥冴��������"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "腥冴��������������絨�������"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "���篆≦��罘�筝������＜����祉�若�吾����������域�����������"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "��純�宴����� I/O �����帥�ゃ����≪�����:"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "腱�"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "�����ャ�������ュ��"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "�����ャ��絎�������������"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "�����������ュ��"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "������絎�������������"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "�憜�������医��������������筝������������ヤ����������祉��茵�荐�"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "筝�膣�(茱炊��綛眼��筝�2罅�)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "���(10��我�域；荐�)"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24���������荐���с�����"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12���������荐���с�����"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "綛眼�����������������膊������ユ��(10��我�域；荐�)"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "���(10��我�域；荐�)"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "���(10��我�域；荐�)"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "��������障��������緇�"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "腱�(10��我�域；荐�)"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "��宴��篏������������ャ��(10��我�域；荐�)"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "�憜�������医��������������筝������������ヤ��茵�荐�"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "茱炊�����筝�2罅�(筝�膣���������������障�����綛�)"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "(4罅����)茱炊��綛�"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "��帥�ゃ����障�若�潟�障�������障�若�喝����障����������ュ��"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "���絎�絖�"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "茯����"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "箴�"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "��＜����祉�若�吾����蚊�����絎�"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "���"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "綣������� - 1罧級��"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "綣������� - 2罧級��"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "綣������� - 3罧級��"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI �����潟��"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "綣������蚊��緇����"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "綣�������������1�����蚊����御��"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "綣�������������2�����蚊����御��"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "綣�������������3�����蚊����御��"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "URI �����蚊����御��"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "荐��垩��茯����"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4868,11 +4878,11 @@ msgstr ""
 "�����ャ�若�鴻�違����若��\n"
 "��＜����祉�若��ID"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "x������絎�������������������expr���茵�腓�"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4886,7 +4896,7 @@ msgstr ""
 "綣����膃�篁������＜����祉�若�御�����(臀峨��������)\n"
 "���絖� %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4898,15 +4908,15 @@ msgstr ""
 "���絖� ������筝����綣�\n"
 "���絖� ������筝����綣�"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "��������潟�������御��"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "�����若����ゃ�潟��"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4916,11 +4926,11 @@ msgstr ""
 "��障�������������鴻����ゃ�潟�帥����＜����ャ�若�����������筝����臀���������若����若��\n"
 "��������у����＜����ャ�若����激�с�若��������������紊���眼����������������с����障�����"
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "罔�羣�"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "���Sylpheed"
 
@@ -4988,189 +4998,185 @@ msgstr "���������������荐�絎�"
 msgid "Enabled"
 msgstr "������"
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "���綵���������若�� '%s' ��������ゃ����������������с�����?"
 
-#: src/prefs_filter.c:758
-msgid "(Untitled)"
-msgstr "(���腱井��荐�絎�)"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "�����若�����������"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 msgid "Filter rule"
 msgstr "�����ｃ����帥����若��"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr "罨＜����＞散������������������荅峨����������翫��"
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr "罨＜����＞散��������鴻�����荅峨����������翫��"
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr "罨＜����≪����激�с�潟��絎�茵�:"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr "To ��障����� Cc"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 msgid "Any header"
 msgstr "������������������������"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 msgid "Edit header..."
 msgstr "������������膩����..."
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 msgid "Message body"
 msgstr "��＜����祉�若�御�����"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr "��潟����潟�����絎�茵�腟����"
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr "腟������ユ��"
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "���罨＜��������"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 msgid "doesn't contain"
 msgstr "���罨＜�������障�����"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr "���罨＜��筝����"
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr "���罨＜��筝���眼��������"
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr "���罨＜��罩ｈ�頫��憗�����������"
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr "���罨＜��罩ｈ�頫��憗��������������������"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr "���罨＜�����紊с�����"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr "���罨＜�����絨�������"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr "���罨＜�������激��"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr "���罨＜�����������"
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "腱糸��"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 msgid "Copy to"
 msgstr "��潟�����"
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "���篆＜��������"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 msgid "Delete from server"
 msgstr "��泣�若��������������"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 msgid "Set mark"
 msgstr "�����若��"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 msgid "Set color"
 msgstr "��������若��������������絎�"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 msgid "Mark as read"
 msgstr "茯����������������������"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 msgid "Forward as attachment"
 msgstr "羞私�����������荵∫��"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 msgid "Redirect"
 msgstr "������������������荵∫��"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 msgid "Execute command"
 msgstr "��潟����潟�����絎�茵�"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr "�����若�����荅�箴＜�����罩�"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 msgid "folder:"
 msgstr "������������:"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 msgid "address:"
 msgstr "��≪��������:"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 msgid "Edit header list"
 msgstr "��������������鴻�����膩����"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 msgid "Headers"
 msgstr "���������"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 msgid "Header:"
 msgstr "���������:"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 msgid "Rule name is not specified."
 msgstr "�����若�����������絎���������������障��������"
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 msgid "Command is not specified."
 msgstr "��潟����潟��������絎���������������障��������"
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr "��≦�鴻����＞散���絖���������障�����"
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 msgid "Destination folder is not specified."
 msgstr "腱糸��������������������������絎���������������障��������"
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr "��≦�鴻����≪����激�с�潟��絖���������障�����"
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 msgid "Condition not exist."
 msgstr "��＞散���絖���������障��������"
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 msgid "Action not exist."
 msgstr "��≪����激�с�潟��絖���������障��������"
 
@@ -5429,56 +5435,56 @@ msgstr "�･膓�筝�"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "SMTP��泣�若��: %s ����･膓�筝�..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "HELO ������篆＞賢..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "茯�荐寂賢"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "��＜����祉�若�吾�����篆＞賢..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "EHLO ������篆＞賢..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM ������篆＞賢..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "���篆＞賢"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO ������篆＞賢..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "DATA ������篆＞賢..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "������筝�..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "��＜����祉�若�吾�����篆＞賢 (%d / %d bytes)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "��＜����祉�若�吾�����篆＞賢"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "��＜����祉�若�吾�����篆＞賢�����������若����榊�������障��������"
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5783,120 +5789,120 @@ msgstr "������"
 msgid "Creating summary view...\n"
 msgstr "��泣����������ャ�若��篏����筝�...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "�����若�����������"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "�����若�����罧���ｃ�������障����������������障�����?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "�����������������鴻����ｃ�割賢 (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "���茯���＜����祉�若�吾�����"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "���茯���＜����祉�若�吾����������障�����������緇�������罎�膣≪����障�����?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "���茯���＜����祉�若�吾����������障��������"
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "���茯���＜����祉�若�吾����������障��������罨＜�����������������腱糸�������障�����?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "���罎�膣�"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "��亥����＜����祉�若�吾�����"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "��亥����＜����祉�若�吾����������障�����������緇�������罎�膣≪����障�����?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "��亥����＜����祉�若�吾����������障��������"
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "��亥����＜����祉�若�吾����������障��������罨＜�����������������腱糸�������障�����?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "�����若��篁������＜����祉�若�吾�����"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "�����若��篁������＜����祉�若�吾����������障�����������緇�������罎�膣≪����障�����?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "�����若��篁������＜����祉�若�吾����������障��������"
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "�����若��篁������＜����祉�若�吾����������障��������������������罎�膣≪����障�����?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "���������篁������＜����祉�若�吾�����"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "���������篁������＜����祉�若�吾����������障�����������緇�������罎�膣≪����障�����?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "���������篁������＜����祉�若�吾����������障��������"
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "���������篁������＜����祉�若�吾����������障��������������������罎�膣≪����障�����?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "��＜����祉�若�吾��篁九����у�������������障��..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d ���������"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d ���腱糸��"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d �����潟�����"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " �����御��"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "��亥�� %d ���, ���茯� %d ���, 膩���� %d ��� (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "��亥�� %d ���, ���茯� %d ���, 膩���� %d ���"
@@ -6066,3 +6072,6 @@ msgstr "%.2fGB"
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s ��吾����吾��莨若�帥��紊掩�������障��������\n"
+
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "�����������������������若�����罕�膀�筝�..."
diff --git a/po/ko.po b/po/ko.po
index 5b8dc825..fda892b2 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+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"
@@ -51,11 +51,11 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "螳� 螻������������� 覈���� ��れ����� ��曙�給�����...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -63,19 +63,19 @@ msgstr ""
 "��るジ �ｸ讌� 谿曙�� ��企�れ����給�����.\n"
 "螻������� �ｸ讌����蠍一����� 覈���� �ｸ讌�谿暑�れ�� ������譯殊�語��."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "螻���� �ｸ讌�谿曙�� ��暑�����...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "螻���� �ｸ讌�谿曙�� �����燕��������...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "螻���� �ｸ讌�"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -83,8 +83,8 @@ msgstr ""
 "��� 覃����讌���� ��� ���������襦� �����碁�� 蟆����������. `覈���� 覦�蠍�'襦� 覃����讌�襯�\n"
 "覦���朱�る�� `G' 貉���� ������襯� �����������語��."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -92,60 +92,66 @@ msgstr ""
 msgid "Name"
 msgstr "��企��"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "���襦����貊�"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "���覯�"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "豢�螳�"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "�ｸ讌�"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr "������"
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "������襦�"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "���襦�"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " 蠍磯蓋 螻������朱�� ��れ�� "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "���襷�襦� ��� 螻������� ������������蟆���給��蟾�?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "���覈� ������"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "螻���� ������"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "���襷�襦� ��� 螻������� ������������蟆���給��蟾�?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "������"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "���������"
 
@@ -214,7 +220,7 @@ msgstr " 覦���� "
 msgid "Abort"
 msgstr "譴�讌����"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -224,11 +230,11 @@ msgstr ""
 "��語�� 覈���轟�伎�� �����ロ����語��:\n"
 "(`%s'��� �����殊�企����朱�� ���豌企�� 蟆����������)"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -238,7 +244,7 @@ msgstr ""
 "��語�� 覈���轟�伎�� �����ロ����語��:\n"
 "(`%s'��� �����殊�企����朱�� ���豌企�� 蟆����������)"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr ""
 
@@ -246,7 +252,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "譯殊��襦���� 豢�螳�"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "譯殊��"
@@ -332,8 +338,8 @@ msgstr "/譯殊��(_A)/�ｸ讌�(_E)"
 msgid "/_Address/_Delete"
 msgstr "/譯殊��(_A)/������(_D)"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/���蟲�(_T)"
 
@@ -341,13 +347,13 @@ msgstr "/���蟲�(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/���蟲�(_T)/LDIF ������ 螳���語�り鍵(_L)"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/������襷�(_H)"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/������襷�(_H)/sylpheed ���覲�(_A)"
 
@@ -364,10 +370,10 @@ msgid "/New _Folder"
 msgstr "/��� �启��(_F)"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -386,17 +392,17 @@ msgstr "/������(_D)"
 msgid "E-Mail address"
 msgstr "��企����� 譯殊��"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "譯殊��襦�"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "��企��:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -559,7 +565,7 @@ msgid "Group"
 msgstr "蠏碁９"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "�启��"
 
@@ -583,7 +589,7 @@ msgstr "螻旧�� 譯殊��襦�"
 msgid "Personal address"
 msgstr "螳���� 譯殊��襦�"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "���襴�"
 
@@ -591,7 +597,7 @@ msgstr "���襴�"
 msgid "Warning"
 msgstr "蟆所��"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "������"
 
@@ -603,31 +609,31 @@ msgstr "蟆所�� ������ ��れ�伎�朱��蠏碁ゼ �����燕��������...\n"
 msgid "Show this message next time"
 msgstr "��れ��覯���� ��� 覃����讌� 覲願鍵"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "��る��讌����"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "������"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "覿�������"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "���������"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "豌����"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "��轟��"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "螳����"
 
@@ -635,7 +641,7 @@ msgstr "螳����"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "������"
 
@@ -647,8 +653,8 @@ msgstr "/豢�螳�(_A)..."
 msgid "/_Remove"
 msgstr "/������(_R)"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/��轟��(_P)..."
@@ -814,8 +820,8 @@ msgstr "/覲願鍵(_V)/Reply to(_R)"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/覲願鍵(_V)/---"
 
@@ -842,7 +848,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -925,140 +931,145 @@ msgstr "/覲願鍵(_V)/覓語�����(_C)/Simplified Chinese (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/覲願鍵(_V)/覓語�����(_C)/Simplified Chinese (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/覲願鍵(_V)/覓語�����(_C)/Traditional Chinese (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/覲願鍵(_V)/覓語�����(_C)/Traditional Chinese (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/覲願鍵(_V)/覓語�����(_C)/���蟲� (EUC-KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/覲願鍵(_V)/覓語�����(_C)/Thai (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/覲願鍵(_V)/覓語�����(_C)/Thai (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/���蟲�(_T)/譯殊��襦�(_A)"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/���蟲�(_T)/������襴�(_T)"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/���蟲�(_T)/������(_n)"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/���蟲�(_T)/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/�ｸ讌�(_E)/��碁�� �ｸ讌�蠍磯�� �ｸ讌�(_x)"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/���蟲�(_T)/������(_n)"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/覃����讌�(_M)/�����誤��(_E)"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: �����殊�� �����給�����\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "�����ろ�� 覿�覿���� ��詞�� ���螳� �����給�����\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "��語�� 覿���� ������ ������."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "覃����讌� ������/������ ������ ������."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s�����殊�� �����給�����\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s��� ������ ���蠍磯ゼ ������螳� �����給�����\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "%s �����殊�� 觜� �����殊��������."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "%s襯� ��曙�� ���螳� �����給�����."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "覃����讌�: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "multipart 覃����讌���� 覿�覿���� ��詞�� ���螳� �����給�����."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [���������]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 覃����讌� �ｸ讌�%s "
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "覃����讌�%s �ｸ讌�"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "覦���� ��������� 讌�������讌���������給�����"
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "覃���� 覦����"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "���覈���� 觜������給�����. 蠏碁����� 覲企�手�����?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "覦���� ������ 覈�襦���� ��詞�� ���螳� �����給�����"
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1066,26 +1077,26 @@ msgstr ""
 "覃���殊�� 覲企�願鍵������ 螻������� 讌���������伎��讌������給�����.\n"
 "覲企�願鍵 ������ 覃���� 螻������� �����������語��."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s襦� 覃����讌�襯� 覲企�企�� 譴� ������螳� 覦���������給�����."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "覃����讌�襯� 覲企�� �ｸ讌������� �����ロ�� ���螳� �����給�����"
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "������ ��������� ��� ID `%s'��� ��郁屋��� ��企�� ��る�� 谿場�� ��� �����給�����."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "������ 覈����襯� 覦�蠖����螳� �����給�����\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1094,141 +1105,141 @@ msgstr ""
 "覃����讌���� 覓語�������� 覲�蟆渚�� ���螳� �����給�����.\n"
 "蠏碁����� 覲企�手�����?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "��る��襯� ��� ���螳� �����給�����\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "��る����� 覃����讌�襯� ���蟇壱�� ���螳� �����給�����\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "覃����讌�襯� ������ 覲願�����������...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "��� �启��襯� 谿場�� ���螳� �����給�����\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "覃����讌�襯� ������ 覲願����� ���螳� �����給�����\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "�����焔�� Message-ID: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "�ｸ讌�谿曙�� �����燕��������...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "襷���� ������"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "���蠍�"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "覲企�� ������:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "覃����讌� 覲企�願鍵"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "���譴���� 覲企�願鍵"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "覲企�� �ｸ讌������� ��ｌ�伎�� ���譴���� 覲企�願鍵"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "������ 覲願�����"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "������ 覲願�������� ��ｊ鍵"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "��曙��"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "�����殊�� ��曙�����������"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "豌�覿�"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "������ 豌�覿�"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "���覈�"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "���覈� �����殊�� ��殊����ｌ�給�����"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "�ｸ讌�蠍�"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "��碁�� �ｸ讌�蠍磯�� �ｸ讌�"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "譴�覦�蠖�"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "蠍� 譴���������� ������ 譴�覦�蠖���� ���������"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "���覦�襯伎�������� 襷���� ������."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "�����殊�� ���蟇磯�� 觜���������給�����."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 #, fuzzy
 msgid "Properties"
 msgstr "��轟��"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "��語�����"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "蟆暑��"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "������ ��企��"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "��碁�� �ｸ讌�蠍� 覈���轟�願�� ���覦�襯伎�������給�����: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1239,72 +1250,72 @@ msgstr ""
 "��� ���襦���語�るゼ 螳����襦� 譬�襭�������蟾����?\n"
 "���襦���語�� 蠏碁９ �����企��: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "���襦���語�� 蠏碁９ id: %d襯� 譬�襭�������"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "������ ������: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "�ｸ讌�: 覈������磯�������� ���襦���語�る��覿���� �����レ�� ��������給�����\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "��碁�� �ｸ讌�蠍磯ゼ ��ろ����� ���螳� �����給�����\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "�����朱�� ��� ���螳� �����給�����\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "�����危�� ��所鍵 ��ろ��\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "覃����讌�襯� ������ 覲願�������� ��ｌ�����螳� �����給�����."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "������ ������"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "������ ������"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "覃����讌� 覯�襴�蠍�"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "��� 覃����讌���� ��������������給�����. 覲�蟆曙�������� 覯�襴願�����?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "覯�襴�蠍�"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "������ 覲願�������朱��"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' ������襴酔�� ���������蟾����?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "������襴酔�� ���������������."
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "���豌�"
 
@@ -1465,12 +1476,12 @@ msgstr "�启�� �ｸ讌�"
 msgid "Input the new name of folder:"
 msgstr "��� �启����� ��企����� ��ｌ�殊�語��:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "��� �启��"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "��� �启����� ��企����� ��ｌ�殊�語��:"
 
@@ -1639,163 +1650,159 @@ msgstr "�����殊�� ��れ����� ��郁鍵螳� ��ろ�������給�����\n"
 msgid "Select folder"
 msgstr "�启�� ������"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "覦���� �ｸ讌����"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "覦���� �ｸ讌����"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "覲企�� �ｸ讌����"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "讌���� �ｸ讌����"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "������ 覲願�����"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "��� �启��"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c'��� �启�� ��企����� ��������� ��� �����給�����."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' �启��螳� ��企�� 譟伎�����������."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' �启��襯� �����燕�� ���螳� �����給�����."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/��� �启�� 襷���り鍵(_n)..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/�启�� ��企�� 覦�蠑瑚鍵(_R)..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/�启�� 讌���郁鍵(_D)"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "讌���� �ｸ讌���� 觜���郁鍵"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/��� 覃����讌� ������(_C)"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/�启�� ��碁Μ 螳煙��(_e)"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/覃����讌� 谿剰鍵(_S)..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "��� ��曙�� 覃����讌�螳� �����給�����."
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/��伎�り係襭� 蟲����(_b)..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/��伎�り係襭� ������(_R)"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "�启�� 觀磯ゼ �����燕��������...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "���蟆�"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "�����曙��"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "���豌�"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "�启�� ���覲企ゼ ��れ�����������...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "�启�� ���覲企ゼ ��れ�����������..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s襯� ��れ�����������..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s �启��襯� ��れ�����������..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "�启�� ��碁Μ 螳煙��"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "�启�� ��碁Μ襯� 螳煙�����������..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "�启�� ��碁Μ襯� 螳煙�����������..."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "覈���� �启�� ��碁Μ襯� 螳煙�����������..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "覈���� �启����� ���襦���� 覃����讌�襯� �����誤��������..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s �启��螳� ��������������給�����\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "覃����讌���� 覲企�企�� 譴�"
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "%s襦� 覃����讌�襯� 覲企�企�� 譴� ������螳� 覦���������給�����."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1805,16 +1812,16 @@ msgstr ""
 "(襷���� �������启��襯� �����ロ��蠍� ������ �启��襯� �����燕����る��,\n"
 "��企����� 襷�讌�襷���� `/'襯� 豢�螳������語��)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s'��������� ��� ��企����� ��ｌ�殊�語��:"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "�启�� ��企�� 覲�蟆�"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1823,24 +1830,24 @@ msgstr ""
 "`%s'��������� ������ 覈���� �启����� 覃����讌�螳� ��������� 蟆����������.\n"
 "���襷�襦� ������������蟆���給��蟾�?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "�启�� ������"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "`%s' �启��襯� ���蟇壱�� ���螳� �����給�����."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "讌���� �ｸ讌���� 觜���郁鍵"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "讌���� �ｸ讌������������� 覈���� 覃����讌�襯� 觜���瑚�����?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1849,34 +1856,34 @@ msgstr ""
 "`%s' 覃���朱����るゼ ���襷�襦� ������������蟆���給��蟾�?\n"
 "(覃����讌�螳� �����ろ��襦�覿���� ������������蟆���� ������������)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "覃���朱����るゼ ���蟇壱��������"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "���襷�襦� `%s' IMAP4 螻������� ������������蟆���給��蟾�?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 螻���� ������"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "���襷�襦� `%s' ��伎�り係襭轟�� ������������蟆���給��蟾�?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "��伎�り係襭� ������"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "���襷�襦� `%s' ��伎�り係襭� 螻������� ������������蟆���給��蟾�?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "��伎�り係襭� 螻���� ������"
 
@@ -1924,7 +1931,7 @@ msgstr ""
 msgid "Can't retrieve newsgroup list."
 msgstr "��伎�り係襭� 覈�襦���� ��詞�� ���螳� �����給�����."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "���襭�."
 
@@ -2212,7 +2219,7 @@ msgstr "LDIF �����殊�� 譯殊��襦���朱�� 螳���語�り鍵"
 msgid "Prev"
 msgstr "��伎��"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "��れ��"
 
@@ -2302,7 +2309,7 @@ msgstr "POP3 ���覯� %s��� ��郁屋���������..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "%s:%d POP3 ���覯���� ��郁屋��� ���螳� �����給�����\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "��語�� 譴����������..."
 
@@ -2332,7 +2339,7 @@ msgstr "覃����讌���� ���蠍磯ゼ ��視�� 譴� (LIST)..."
 msgid "Deleting message %d"
 msgstr "%d 覃����讌�襯� ������������ 譴�"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "���襷�豺���� 譴�"
 
@@ -2374,7 +2381,8 @@ msgstr "�����殊�� ��� ���螳� �����給�����."
 msgid "Socket error."
 msgstr "���貅� ������."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2389,19 +2397,19 @@ msgid ""
 "%s"
 msgstr "覃���朱����り�� ���蟆������給�����."
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 #, fuzzy
 msgid "Authentication failed."
 msgstr "��語�� 覦�覯�"
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "��語�� 覦�覯�"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr ""
 
@@ -2824,329 +2832,329 @@ msgstr "/覲願鍵(_V)/覓語�����(_C)/��朱蓋 (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/覲願鍵(_V)/覓語�����(_C)/��朱蓋 (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/覲願鍵(_V)/覓語�����(_C)/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/覲願鍵(_V)/覓語�����(_C)/���蟲� (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/覲願鍵(_V)/��� 谿曙�朱�� ��願鍵(_w)"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/覲願鍵(_V)/覃����讌� ������(_a)"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/覲願鍵(_V)/覈���� ��る��覲願鍵(_h)"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/覲願鍵(_V)/������ 螳煙��(_U)"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/覃����讌�(_M)"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/覃����讌�(_M)/��れ�� �ｸ讌�(_e)"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/覃����讌�(_M)/覈���� 螻���������� 覦�蠍�(_a)"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/覃����讌�(_M)/覈���� 螻���������� 覦�蠍�(_a)"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/覃����讌�(_M)/覦�蠍� 豬����(_g)"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/覃����讌�(_M)/��れ�� �ｸ讌�(_e)"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/覃����讌�(_M)/������ 覲願����� 覃����讌� 覦����(_S)"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/覃����讌�(_M)/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/覃����讌�(_M)/���襦� 襷���り鍵(_n)"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/覃����讌�(_M)/������(_R)"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/覃����讌�(_M)/������(_y)"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/覃����讌�(_M)/������(_y)/���豌�(_a)"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/覃����讌�(_M)/������(_y)/覲企�語��(_s)"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/覃����讌�(_M)/������(_y)/覃���朱��襴���ろ��(_l)"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/覃����讌�(_M)/������(_F)"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/覃����讌�(_M)/豌�覿������朱�� ������(_w)"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/覃����讌�(_M)/Redirec_t"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/覃����讌�(_M)/��企��(_o)..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/覃����讌�(_M)/覲旧��(_C)..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/覃����讌�(_M)/������(_D)"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/覃����讌�(_M)/������(_M)"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/覃����讌�(_M)/������(_M)/������(_M)"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/覃����讌�(_M)/������(_M)/������ 讌����(_U)"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/覃����讌�(_M)/������(_M)/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/覃����讌�(_M)/������(_M)/��曙�������� 蟆���朱�� ������(_e)"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/覃����讌�(_M)/������(_M)/��曙�� 蟆���朱�� ������(_d)"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/覃����讌�(_M)/������(_M)/覈���� ��曙�� 蟆���朱�� ������(_r)"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/覃����讌�(_M)/��れ�� �ｸ讌�(_e)"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/���蟲�(_T)/譯殊��襦���� 覲企�語�� 豢�螳�(_k)"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/���蟲�(_T)/覃����讌� ������(_F)"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/���蟲�(_T)/覃����讌� ������(_F)"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/���蟲�(_T)/������ 蠏�豺� ������(_C)"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/���蟲�(_T)/������ 蠏�豺� ������(_C)/������(_A)"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/���蟲�(_T)/������ 蠏�豺� ������(_C)/覲企�語�企��(_F)"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/���蟲�(_T)/������ 蠏�豺� ������(_C)/覦������企��(_T)"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/���蟲�(_T)/������ 蠏�豺� ������(_C)/���覈���朱��(_S)"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/���蟲�(_T)/譴�覲給�� 覃����讌� 讌���郁鍵(_p)"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/���蟲�(_T)/��ろ��(_x)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/���蟲�(_T)/襦�蠏� 谿�(_L)"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/��れ��(_C)"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/��れ��(_C)/蠍磯蓋������ ��れ��(_C)..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/��れ��(_C)/������ ��れ��(_F)..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/��れ��(_C)/������襴�(_T)..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/��れ��(_C)/������(_A)..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/��れ��(_C)/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/��れ��(_C)/螻������� ��磯ジ ��れ��(_P)..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/��れ��(_C)/��� 螻���� 襷���り鍵(_n)..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/��れ��(_C)/螻���� �ｸ讌�(_E)..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/��れ��(_C)/������ 螻������� 覲�蟆�(_h)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/������襷�(_H)/��る�����(_M)"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/������襷�(_H)/��る�����(_M)/������(_E)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/������襷�(_H)/��る�����(_M)/��朱蓋���(_J)"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/������襷�(_H)/FAQ(_F)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/������襷�(_H)/FAQ(_F)/������(_E)"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/������襷�(_H)/FAQ(_F)/�����殊��(_G)"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/������襷�(_H)/FAQ(_F)/��ろ����語��(_S)"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/������襷�(_H)/FAQ(_F)/��������れ��(_F)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/������襷�(_H)/FAQ(_F)/��危��襴����(_I)"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/������襷�(_H)/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "��� 谿曙�� 襷����������...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "覃���� 谿�: ��� ������ %d ��ろ��\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "襷�豺�.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "���覈� ������"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "������"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "谿� 覿�襴� ��������� %d������ %d襦� 覦�蠖�������\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "讌���� �ｸ讌���� 觜���郁鍵"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "讌���� �ｸ讌������������� 覈���� 覃����讌�襯� 觜���瑚�����?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "覃���朱����� 豢�螳�"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3156,16 +3164,16 @@ msgstr ""
 "蠍一ヾ��� 覃���� 覦���り�� 讌�������覃� ��������朱��\n"
 "��れ�����蟆����������."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "覃���� 覦���� `%s'螳� ��企�� 譟伎�����������."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "覃���朱�����"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3174,144 +3182,144 @@ msgstr ""
 "覃���朱����� �����煙�� ��ろ�������給�����.\n"
 "���襷� ��企�� �����殊�� ��企�� 譟伎�����蟇磯�� 蠏� 螻褐�� ��郁鍵 蟠������� �����給�����."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - �启�� 覲願鍵"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 覃����讌� 覲願鍵"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/������(_R)"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "���覿����蟆� ��������� 覲企��������"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/������(_y)/覲企�語��(_s)"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/������(_y)/覃���朱��襴���ろ��(_l)"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/������(_F)"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/豌�覿�襦� ������(_w)"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "覦�蠍�"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "��� 覃���殊�� 螳���語�給�����"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "���覿� 覦�蠍�"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "覈���� 螻���������� ��� 覃���殊�� 螳���語�給�����"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "������ 覲願����� 覃����讌�襯� 覲企��������"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "������"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "��� 覃����讌�襯� �����燕��������"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "������"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "覃����讌���� ��������� 覲企��������"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "���豌� ������"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "���覿����蟆� ��������� 覲企��������"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "������"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "覃����讌�襯� ��るジ ���������蟆� ���������������"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "覃����讌�襯� 讌����������"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "��ろ��"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "��������� ���襦���語�る�れ�� ��ろ�����������"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "��れ�� ��� ��曙�� 覃����讌�襯� 覲伎��譴�������"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "��れ��"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "蠍磯蓋������ ���蟆� ��れ��"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "螻����"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "螻������� ��れ�����������"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "�����願鍵"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "��� ���襦�蠏碁����� �����伎��蟆���給��蟾�?"
 
@@ -3433,28 +3441,28 @@ msgstr "覃����讌���� ������ �����������給�����; ������覿�覿������� 螻�������蟾��
 msgid "Search finished"
 msgstr "谿剰鍵螳� ���襭�"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "覃����讌� 觀磯ゼ �����燕��������...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "�����ろ��"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "豌�覿�"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' �����殊�� �����ロ�� ���螳� �����給�����."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "��語��"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3463,7 +3471,7 @@ msgstr ""
 "��語�� 覈���轟�伎�� �����ロ����語��:\n"
 "(`%s'��� �����殊�企����朱�� ���豌企�� 蟆����������)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3906,7 +3914,7 @@ msgstr "���覯������� 覈���� 覃����讌�襯� 覦����"
 msgid "Receive size limit"
 msgstr "覦���� ���蠍� ������"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr ""
 
@@ -3926,7 +3934,7 @@ msgstr "(�����磯�� ���讌� ������ 覃����讌���� ��� �启����� �����ル�� 蟆��������
 msgid "Authentication method"
 msgstr "��語�� 覦�覯�"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "������"
 
@@ -3950,7 +3958,7 @@ msgstr "Message-ID ������"
 msgid "Add user-defined header"
 msgstr "��������� ��������� ��る�� 豢�螳�"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " �ｸ讌�..."
 
@@ -4402,30 +4410,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Simplified Chinese (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "譴�蟲� (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "���蟲� (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4434,129 +4447,129 @@ msgstr ""
 "`������'��� ���������覃�, ������ 襦�貅���殊�� 襷���� 豕�������\n"
 "��語����� 覦������� ���������������."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "覲企�願鍵 ������ 譴� 覦�蠖�"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "���覈� 覿�襴����"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "讌������朱�� ��曙��"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "��������朱�� ��碁�� �ｸ讌�蠍� ������"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "譴� 覦�蠖� at"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "蠍����"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "��語����� 譴� 覦�蠖�"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr ""
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "覲企�願鍵 ������ 譴� 覦�蠖�"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "��������朱�� ��������� 螻���� ������"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "��������� ��� 覃����讌�襯� ��語��"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "������ 覯���殊�� 覃���朱��襴���ろ�語�� ������ ��������朱�� ������"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "������ ������"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "��語�� 覿����"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "������ ������"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " 覿���� ��る�� "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "蠍�蠎�"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "��る�� ��企����� 覯����(`From:', `Subject:' ��焔��)"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "�启����企�������� ��曙�������� 覃����讌� ���襯� ������"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr ""
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "������ 覲願鍵"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "覲企�� ��������� 覲語�語�� 蟆曙�� 覲企�� ������ 豺語�� 覦���� ��������� ������"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "��磯����� �ｴ蠍�"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "���讌� ������"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr "�����曙�� ��������� ���覈� ��れ��... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "覃����讌���� ������ ��伎�������� 覲伎��譯手鍵"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4564,326 +4577,326 @@ msgstr ""
 "��れ��覦���危�� ������覯滑骸 ������襯� ASCII 覓語��襦�\n"
 "������ (��朱蓋��伎�� 蟆曙�一��襷�)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "覃����讌� 覲願鍵 ������ ��る�� 谿� ������"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "覃����讌�襯� 覲朱�� 螳������� ��る��襷� ������"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "譴� 螳�蟆�"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "��曙��"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "��ろ��襦�"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "覦� �����伎��"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "覿���������� ��ろ��襦�"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr ""
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "豌�覿���� ��企�語�� ���蠍� 譟一��"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "��������� ��る�� ��れ��"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "��������朱�� ���覈� ������"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "������ 谿曙�� ���覈� ������ 蟆郁骸 覲伎�願鍵"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "觜�覦�覯���碁ゼ 覃�覈�襴���� ������ 覲願��"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr ""
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "覿� "
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "passphrase襯� �����ロ����� Grab input"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG螳� ���������讌� ������ 蟆曙�� ��������� 蟆所�� ������"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "��企�� 覃����讌� �����朱�� ���������讌� ��������給�����."
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "�启����� ��れ�願��覃� 豌�覯�讌� �����曙�� 覃����讌� ��願鍵"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "��� 谿曙����� ��企�語�� 蟆曙�一��襷� 覃����讌�襯� ��曙�� 蟆���朱�� ������"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "��� �ｸ讌�襯� 覦���� ��� 覦���� �ｸ讌������朱�� 螳�蠍�"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "覃����讌�襯� ��企�����蟇磯�� 讌���碁�� 讀���� ��ろ��"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(��願����� 蟶殊�語����� 蟆曙�� 覃����讌���� ��ろ�����蟾�讌�\n"
 "���讌� ������襷� ��� 蟆����������)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "覦�蠍� ������������"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "覦�蠍� ������������ 覲願鍵"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "������"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "覲伎�伎�� ������"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "覦�蠍� ������ 覦������� ������ ������ 覲伎�伎�� ������"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "��������� ��� 覦�蠍� ������������ ���蠍�"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " ��� 覦���碁�� ��れ��... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "��碁�� 覈���� (%s��� ������ ��企�� / URI襦� ���豌企��������)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "��� ������蠍�"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "���觚���企Ν������ ��������� 譯殊�� 豢�螳�"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "�����朱��"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "��������� ������"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "�����朱�� 讌���� �ｸ讌���� 觜���郁鍵"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "讌���� �ｸ讌���� 觜���碁�� �����誤��蠍�"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "������ 覃����讌�螳� ������ ��� 蟆所��"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr ""
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr ""
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr ""
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr ""
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "������ 襦�貅���殊�� �����麹�� ���讌���� ���螳�"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "������ (���/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr ""
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr ""
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr ""
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr ""
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr ""
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "��る��"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "������"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "覃����讌� ��� ��れ��"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "���"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "��語��覓� - 豌�覯�讌� ���螻�"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "��語��覓� - ���覯�讌� ���螻�"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "��語��覓� - ��碁��讌� ���螻�"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI 襷����"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "��語�� ��� 覦�覲�"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "豌�覯�讌� ���螻� ��語��覓� ��� ������"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "���覯�讌� ���螻� ��語��覓� ��� ������"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "��碁��讌� ���螻� ��語��覓� ��� ������"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "URI ��� ������"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "覿���� ��る��"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4907,11 +4920,11 @@ msgstr ""
 "��伎�り係襭�\n"
 "覃����讌�-ID"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4920,7 +4933,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4928,26 +4941,26 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "蠍�蠎� ������"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "��� 覦���碁��"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "蠍磯蓋"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "������ Sylpheed"
 
@@ -5015,213 +5028,208 @@ msgstr "蟇磯ゴ螳� ��れ��"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "���襷�襦� ��� 蠏�豺���� ������������蟆���給��蟾�?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "���覈� ������"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "蠏�豺� ������"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "蠏�豺� ������"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "���蠍� ��る��"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "��る��"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "覲碁��"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "������"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "������ ������"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "������襦� ��企��"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/覲旧��(_C)..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "覦�讌� ������"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "�启�� ������"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "覃�覈�"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "覃����讌� ��� ��れ��"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/������(_M)/��曙�� 蟆���朱�� ������(_d)"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/豌�覿�襦� ������(_w)"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/Redirec_t"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "��ろ��"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "�启��"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "譯殊��"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "��る��"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "��る��"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "��る��"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "覦���� ��������� 讌�������讌���������給�����"
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "覈���轟�� 讌�������讌�������"
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "������ �启��螳� ��れ����� �����伎��讌������給�����"
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "覈���轟�� 讌�������讌�������"
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: �����殊�� �����給�����\n"
@@ -5476,57 +5484,57 @@ msgstr "��郁屋 譴����������"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "SMTP ���覯���� ��郁屋���螻� �����給�����: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "HELO襯� 覲企��������..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "��語��"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 #, fuzzy
 msgid "Sending message..."
 msgstr "覃����讌���� 覲企�企�� 譴�"
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "EHLO襯� 覲企��������..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM��� 覲企��������..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "覲企��������"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO襯� 覲企��������..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "DATA襯� 覲企��������..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "���襷�豺���� 譴�..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "覃����讌�襯� 覲企�企�� 譴� (%d / %d 覦���危��)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "覃����讌���� 覲企�企�� 譴�"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "覃����讌�襯� 覲企�企����� ������ 覦����"
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5832,120 +5840,120 @@ msgstr "覯����"
 msgid "Creating summary view...\n"
 msgstr "������ 谿曙�� �����燕��������...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "������ 豌�襴�"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "������螳� ��������� �����������給�����. 蠏瑚����れ�� 豌�襴����蟾����?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "�启��(%s)襯� ��れ��..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "��� ��曙�� 覃����讌�螳� ������ "
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "��� ��曙�� 覃����讌�螳� �����給�����. ��������� 覿���� 谿場��蟾����?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "��� ��曙�� 覃����讌�螳� �����給�����."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "��� ��曙�� 覃����讌�螳� �����給�����. ��れ�� �启��襦� 螳�蟾����?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "��れ�� 谿剰鍵"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "��� 覃����讌�螳� �����給�����."
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "��� 覃����讌�螳� �����給�����. ��������� 覿���� 谿場��蟾����?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "��� 覃����讌�螳� �����給�����."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "��� 覃����讌�螳� �����給�����. ��れ�� �启��襦� 螳�蟾����?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "��������� 覃����讌�螳� �����給�����"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "��������� 覃����讌�螳� �����給�����. ��������� 覿���� 谿場��蟾����?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "��������� 覃����讌�螳� �����給�����."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "��������� 覃����讌�螳� �����給�����. ��れ�� �启��襦� 螳�蟾����?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "蠎�襴���������� 覃����讌�螳� �����給�����"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "蠎�襴���������� 覃����讌�螳� �����給�����. ��������� 覿���� 谿場��蟾����?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "蠎�襴���������� 覃����讌�螳� �����給�����."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "蠎�襴���������� 覃����讌�螳� �����給�����. 豌����覿���� 谿場��蟾����?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d螳� ���������"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d螳� ��企��"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " �����危�� ������"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d ��� 覃����讌�, %d ��� ��曙��, %d螳� 覃����讌�(%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d ��� 覃����讌�, %d ��� ��曙��, %d螳� 覃����讌�"
@@ -6117,6 +6125,9 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "%s襦� ��郁鍵螳� ��ろ�������給�����.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "覈���� �启�� ��碁Μ襯� 螳煙�����������..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/覲願鍵(_V)/覓語�����(_C)/---"
 
diff --git a/po/nl.po b/po/nl.po
index 2c90d43a..180118b7 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: 2003-02-18 13:03--100\n"
 "Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -65,11 +65,11 @@ msgstr ""
 "bij de Free Software Foundation Inc., 59 Temple Place - Suite 330, Boston, "
 "MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Accountinstellingen worden ingelezen...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -77,19 +77,19 @@ msgstr ""
 "Er zijn nog schermen open om een nieuw bericht op te stellen.\n"
 "Deze moeten gesloten worden om de postvakken te kunnen bewerken."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Accountvoorkeuren worden geopend...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Postvakeigenschappen venster word gemaakt...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Accountbeheer"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -98,8 +98,8 @@ msgstr ""
 "Zet een vinkje in de 'G' kolom om berichten binnen te halen wanneer\n"
 "u op de knop 'Alles ophalen' klikt."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -107,60 +107,66 @@ msgstr ""
 msgid "Name"
 msgstr "Naam"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Bewerken"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr "Verwijderen"
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Omlaag"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " Instellen als hoofdaccount"
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Wilt u dit account werkelijk verwijderen?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Geen titel"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Account verwijderen"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "Wilt u dit account werkelijk verwijderen?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Nee"
 
@@ -229,7 +235,7 @@ msgstr " Verzenden"
 msgid "Abort"
 msgstr "Afbreken"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -239,11 +245,11 @@ msgstr ""
 "Geef de afdrukopdracht:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -253,7 +259,7 @@ msgstr ""
 "Geef de afdrukopdracht:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr ""
 
@@ -261,7 +267,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -347,8 +353,8 @@ msgstr "/_Adres/_Bewerken"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_Gereedschap"
 
@@ -356,13 +362,13 @@ msgstr "/_Gereedschap"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
 
@@ -379,10 +385,10 @@ msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -401,17 +407,17 @@ msgstr "/Ver_wijderen"
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Naam:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -580,7 +586,7 @@ msgid "Group"
 msgstr "Groep"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Accounts"
 
@@ -604,7 +610,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Bericht"
 
@@ -612,7 +618,7 @@ msgstr "Bericht"
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Fout"
 
@@ -624,31 +630,31 @@ msgstr "Waarschuwingsdialoog wordt gemaakt...\n"
 msgid "Show this message next time"
 msgstr "Dit bericht de volgende keer weergeven"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Oranje"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "Rood"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Roze"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Hemelsblauw"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Blauw"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Groen"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Bruin"
 
@@ -656,7 +662,7 @@ msgstr "Bruin"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Geen"
 
@@ -668,8 +674,8 @@ msgstr "/_Toevoegen..."
 msgid "/_Remove"
 msgstr "/_Verwijderen"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/_Eigenschappen..."
 
@@ -834,8 +840,8 @@ msgstr "/B_eeld/Ant_woord naar"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/B_eeld/---"
 
@@ -862,7 +868,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -945,140 +951,145 @@ msgstr "/B_eeld/_Codering/Simpel Chinees (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/B_eeld/_Codering/Simpel Chinees (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/B_eeld/_Codering/Traditioneel Chinees (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/B_eeld/_Codering/Traditioneel Chinees (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/B_eeld/_Codering/Koreaans (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/B_eeld/_Codering/Thais (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/B_eeld/_Codering/Thais (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_Gereedschap/_Adresboek"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_Gereedschap/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/B_ewerken/Be_werken met externe editor"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Be_richt/Codeer"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [Aangepast]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - bericht opstellen%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Bericht opstellen%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1086,26 +1097,26 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Kon gee bijpassende sleutel vinden voor geselecteerde sleutel-id `%s'."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1115,140 +1126,140 @@ msgstr ""
 "%s naar %s.\n"
 "Toch versturen?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "kan geen headers schrijven\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Verzend bericht"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "In de wachtrij plaatsen en later verzenden"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Klad"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Invoegen"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Bijvoegen"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Tekenen"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Handtekening (signature) invoegen"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Bewerken met ander (extern) programma"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Terugloop"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Lange regels op meerdere regels zetten"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "De ingegeven opdracht voor de externe editor is onjuist: '%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1259,72 +1270,72 @@ msgstr ""
 "Zal ik het programma afbreken?\n"
 "procesgroep id: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Programma (id: %d) afgebroken."
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Tijdelijk bestand: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Opstellen: invoer van \"monitoring process\"\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Kon het externe programma voor bewerken van e-mail niet aanroepen\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Kon niet naar bestand schrijven\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Inlezen van pijp mislukt\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Gooi bericht weg"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Dit bericht is aangepast. weggooien?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Gooi weg"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "opslaan als klad"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Vervangen"
 
@@ -1486,12 +1497,12 @@ msgstr "Map hernoemen"
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -1661,163 +1672,159 @@ msgstr "opslaan van de configuratie is mislukt\n"
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Verzonden"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Wachtrij"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan map '%s' niet aanmaken."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/_Nieuwe map maken..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/Map _hernoemen"
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/Map ver_wijderen"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/Nieuwe e-mail _ophalen"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/Accountlijst _verversen"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/Berichten _doorzoeken..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "Geen ongelezen berichten."
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/A_bonneren op een nieuwsgroep..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/Nieuws_groep verwijderen"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Mapoverzicht wordt gemaakt...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Nieuw"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Ongelezen"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Mapinfo wordt ingesteld...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "Accountlijst verversen"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Accountlijsten worden ververst..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Map %s is geselecteerd\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Bezig met verzenden van bericht"
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1827,16 +1834,16 @@ msgstr ""
 "(Als je een map wilt maken om daarin submappen te plaatsen,\n"
 "sluit de naam dan af met een '/')"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1845,24 +1852,24 @@ msgstr ""
 "Alle mappen en berichten in '%s' zullen worden verwijderd.\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1871,34 +1878,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
@@ -1946,7 +1953,7 @@ msgstr "onbekend"
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan geen nieuwsgroep opvragen."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Klaar."
 
@@ -2238,7 +2245,7 @@ msgstr "Importeer LDIF bestand in het adresboek"
 msgid "Prev"
 msgstr "Vorig"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "Volgende"
 
@@ -2329,7 +2336,7 @@ msgstr "Verbinden met POP3 server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan niet verbinden met POP3 server: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Bezig met identificatie..."
 
@@ -2359,7 +2366,7 @@ msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 msgid "Deleting message %d"
 msgstr "Bezig met verwijderen van bericht %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
@@ -2401,7 +2408,8 @@ msgstr "Het bestand is niet beschrijfbaar."
 msgid "Socket error."
 msgstr "Socket-fout."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2416,19 +2424,19 @@ msgid ""
 "%s"
 msgstr "Mailbox is vergrendeld."
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Identificatiemethode"
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Identificatiemethode"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr ""
 
@@ -2852,329 +2860,329 @@ msgstr "/B_eeld/_Codering/Japans (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/B_eeld/_Codering/Japans (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/B_eeld/_Codering/Chinees (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/B_eeld/_Codering/Koreaans (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/B_eeld/Open in _nieuw venster"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/B_eeld/Bekijk _broncode"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/B_eeld/Vo_lledige header"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/B_eeld/_Verversen"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/Be_richt"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Be_richt/_Alle e-mail ophalen"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Be_richt/_Alle e-mail ophalen"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Be_richt/Ontvangen af_breken"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/Be_richt/Berichten uit wachtrij verzenden"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/Be_richt/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/Be_richt/_Nieuw bericht opstellen"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/Be_richt/_Beantwoorden"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/Be_richt/Antwoord _sturen aan"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Be_richt/Antwoord _sturen aan/_iedereen"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Be_richt/Antwoord _sturen aan/_afzender"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Be_richt/Antwoord _sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/Be_richt/_Doorsturen"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/Be_richt/Doorsturen als bij_voeging"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/Be_richt/Om_leiden"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/Be_richt/_Verplaatsen..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/Be_richt/_Kopi谷ren..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/Be_richt/Ver_wijderen"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/Be_richt/_Markeren"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Be_richt/_Markeren/_Markeren"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Be_richt/_Markeren/_Demarkeren"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/Be_richt/_Markeren/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Be_richt/_Markeren/Als _ongelezen"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Be_richt/_Markeren/Als _gelezen"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Be_richt/_Markeren/_Alles gelezen"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Gereedschap/Af_zender toevoegen aan adresboek"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Gereedschap/Berichten _filteren"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Gereedschap/Filterregel _aanmaken"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Gereedschap/_Cre谷er Filterregel/_Automatisch"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Gereedschap/_Cre谷er filterregel/voor A_fzender"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Gereedschap/_Cre谷er filterregel/voor _Geadresseerde"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Gereedschap/_Cre谷er filterregel/voor _Onderwerp"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Gereedschap/Du_bbele berichten verwijderen"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_Gereedschap/_Uitvoeren"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/_Gereedschap/_Logboek"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Instellingen"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Instellingen/Algemene voorkeuren..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Instellingen/_Filterbeheer..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_Instellingen/_Sjabloonbeheer..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_Instellingen/A_cties..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Instellingen/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Instellingen/Accountvoorkeuren..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Instellingen/Nieuw account aanmaken..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Instellingen/Accountbeheer..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Instellingen/Huidig account veranderen"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_Hulp/_Handboek"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hulp/_Handboek/_Engels"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hulp/_Handboek/_Japans"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/_Hulp/_FAQ"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hulp/_FAQ/_Engels"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hulp/_FAQ/_Duits"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hulp/_FAQ/_Spaans"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hulp/_FAQ/_Frans"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hulp/_FAQ/_Italiaans"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_Hulp/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Hoofdvenster wordt aangemaakt...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "klaar.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Geen titel"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Vensterscheidingstype wordt gewijzigd van %d naar %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Mailbox toevoegen"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3184,16 +3192,16 @@ msgstr ""
 "Als een bestaande mailbox wordt ingevuld,\n"
 "dan wordt hij automatisch gescand."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3203,144 +3211,144 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappenoverzicht"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Ant_woord sturen aan/_afzender"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Ant_woord sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Ophalen"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "E-mail ophalen en in de lijst zetten."
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Alles oph."
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "E-mail van alle accounts ophalen en in de lijsten zetten"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Antwoord"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Stuur een bericht terug naar de afzender"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "Iedereen"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Bericht naar iedereen terugsturen."
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Stuur dit bericht door"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Verwijder dit bericht"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Voer de gemarkeerde acties uit"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "Volgende ongelezen"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Voork."
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Account"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Accountinstellingen"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
@@ -3462,28 +3470,28 @@ msgstr "Einde van het bericht bereikt; verdergaan vanaf het begin?"
 msgid "Search finished"
 msgstr "Zoeken voltooid"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Berichtview wordt gemaakt...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Bijvoegingen"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3492,7 +3500,7 @@ msgstr ""
 "Geef de afdrukopdracht:\n"
 "('%s' zal vervangen worden door de bestandsnaam)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3936,7 +3944,7 @@ msgstr "Haal alle berichten op van server"
 msgid "Receive size limit"
 msgstr "Limiet ontvangstgrootte"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "KB"
 
@@ -3956,7 +3964,7 @@ msgstr "(Ongefilterde berichten zullen hier opgeslagen worden)"
 msgid "Authentication method"
 msgstr "Identificatiemethode"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -3980,7 +3988,7 @@ msgstr "Bericht-ID aanmaken"
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr "Bewerken"
 
@@ -4452,30 +4460,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Vereenvoudigd Chinees (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Vereenvoudigd Chinees (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditioneel Chinees (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditioneel Chinees (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinees (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Koreaans (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Thais (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Thais (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4484,11 +4497,11 @@ msgstr ""
 "Als 'Automatisch' is geselecteerd, wordt de meest\n"
 "optimale codering voor de huidige locale gebruikt."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "Berichtcodering"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4497,119 +4510,119 @@ msgstr ""
 "Geef de Content-Transfer-Encoding die gebruikt wordt om\n"
 "het bericht te coderen wanneer deze non-ASCII tekens bevat."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Handtekening scheidingsteken"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Automatisch invoegen"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Automatisch extern programma starten voor bewerken van e-mail bericht"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "niveau van ongedaan maken"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Regelterugloop na:"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "tekens"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Regelterugloop gebruiken bij citeren"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Regelterugloop tijdens invoer"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Regelterugloop activeren bij het verzenden"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "Account automatisch selecteren voor beantwoorden"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Originele bericht citeren bij beantwoorden"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "Antwoorden roept de functie 'Mailinglijst beantwoorden' aan"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Antwoordopmaak"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Citeerteken"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Doorstuuropmaak"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Beschrijving der symbolen"
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Lettertype"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Headervelden vertalen (zoals 'From:', 'Subject:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Aantal ongelezen berichten weergeven naast mapnaam"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "Nieuwsgroepen inkorten die langer zijn dan"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "brieven"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Berichtenlijst"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Ontvanger weergeven in 'Afzender' kolom wanneer u zelf de afzender bent"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Discussies uitklappen"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Datumopmaak"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr "Kies kolommen voor berichtenlijst..."
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Kleurmarkering in berichten aanzetten"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4617,331 +4630,331 @@ msgstr ""
 "Multi-byte tekens weergeven als ASCII tekens\n"
 "(alleen Japans)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Headerinformatie weergeven boven bericht"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Korte headerinformatie weergeven boven bericht"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Regelafstand"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Schuiven"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Halve pagina"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Vloeiend schuiven"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Stap"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Bijgevoegde afbeeldingen schalen"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Headerweergave instellingen"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Controleer identificatiehandtekeningen automatisch"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Geef het resultaat van de controle weer in een popupvenster"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Wachtwoord tijdelijk in geheugen opslaan"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Verloopt na"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "minuten"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Instellen op '0' zal het wachtwoord tot het\n"
 " einde bam de sessie opslaan)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Toetsenbord vasthouden tijdens het intikken van het wachtwoord"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Waarschuw mij wanneer GnuPG bij het opstarten niet werkt"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Geen berichtsbestand geselecteerd."
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Het eerste ongelezen e-mailtje openen wanneer een map geopend wordt"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Bericht alleen als gelezen markeren wanneer het geopend is in een nieuw "
 "venster"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "Ga naar de inbox na het ophalen van nieuwe e-mail"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Berichten worden gemarkeerd voor deze acties\n"
 "wanneer dit uitgeschakeld is)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Ontvangstvenster"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Ontvangstvenster weergeven"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Altijd"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Nooit"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "Geen foutmelding geven bij ontvangstfout"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Ontvangstvenster sluiten wanneer het klaar is."
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " Sneltoetsen instellen..."
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externe opdrachten (%s is het bestand / URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Webbrowser"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "Adres toevoegen aan 'Geadresseerden' bij dubbelklikken"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "Afsluiten"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Bevestigen bij het afsluiten"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "Prullenbak leegmaken bij het afsluiten"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Bevestigen bij het legen"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Waarschuw wanneer er berichten in de wachtrij staan"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "afgekorte dag van de week"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "volledige dag van de week"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "afgekorte naam van de maand"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "volledig naam van de maand"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "de voorkeurs datum en tijd voor de huidige locale"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "eeuwnummer (jaar/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "dag van de maand als decimaal nummer"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "het uur als decimaal nummer op een 24 uurs klok"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "het uur als decimaal nummer op een 12-uurs klok"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "dag van het jaar als decimaal nummer"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "de maand als decimaal nummer"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "de minuut als decimaal nummer"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "AM of PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "de seconde als decimaal nummer"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "de dag van de week als decimaal nummer"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "de voorkeursdatum voor de huidige locale"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "de laatste twee cijfers van het jaartal"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "het jaartal als decimaal nummer"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "de tijdzone of naam of afkorting"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Selecteer"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Beschrijving"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "Voorbeeld"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Berichtkleuren instellen"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Geciteerde tekst - eerste niveau"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Geciteerde tekst - tweede niveau"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Geciteerde tekst - derde niveau"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Gebruikte kleuren opnieuw gebruiken"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "Selecteer kleur voor niveau 1"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "Selecteer kleur voor niveau 2"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "Selecteer kleur voor niveau 3"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "Selecteer kleur voor URI"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Beschrijving der symbolen"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4965,11 +4978,11 @@ msgstr ""
 "Nieuwsgroepen\n"
 "Bericht-ID"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Als x ingesteld is, expr weergeven"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4983,7 +4996,7 @@ msgstr ""
 "Geciteerde berichtinhoud zonder handtekening\n"
 "Letterlijk %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4995,15 +5008,15 @@ msgstr ""
 "Letterlijk haakje openen\n"
 "Letterlijk haakje sluiten"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Lettertype"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Sneltoetsen"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -5014,11 +5027,11 @@ msgstr ""
 "op de gewenste toetscombinatie te drukken wanneer de\n"
 "muis boven het menu item zweeft."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "Standaard"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Oude Sylpheed"
 
@@ -5086,213 +5099,208 @@ msgstr "Filterbeheer"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Wil je deze regel werkelijk verwijderen?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Geen titel"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Verwijder deze regel"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "Verwijder deze regel"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "Verborgen headers"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "Header"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "Bericht"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "bevat"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "bevat geen"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "Omlaag"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Kopieer..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Ontvangst weigeren"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "Verwijder map"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "Opmerkingen"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "Berichtkleuren instellen"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Markeren/Als _gelezen"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/_Omleiden"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "Uitvoeren"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "Accounts"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "Adres"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "Header"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "Header"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "Header"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Opdrachtregel is niet ingesteld."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Er is geen map gekozen om het heen te verplaatsen."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Opdrachtregel is niet ingesteld."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: bestand bestaat niet\n"
@@ -5552,57 +5560,57 @@ msgstr "Bezig met maken van verbinding"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Bezig met verbinden met SMTP server: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "Bezig met sturen van HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "Bezig met identificatie"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 #, fuzzy
 msgid "Sending message..."
 msgstr "Bezig met verzenden van bericht"
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "Bezig met sturen van EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "Bezig met verzenden van MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "Bezig met verzenden"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "Bezig met verzenden van RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "Bezig met verzenden van DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Bezig met afsluiten..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Bezig met verzenden van bericht (%d / %d bytes)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "Bezig met verzenden van bericht"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "Er is een fout opgetreden bij het verzenden."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5908,120 +5916,120 @@ msgstr "Nr."
 msgid "Creating summary view...\n"
 msgstr "Venster Berichtenlijst wordt aangemaakt...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Verwerk markering"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Sommige markeringen zijn nog aanwezig. Verwerken?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Bezig met inlezen van map (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Geen ongelezen berichten meer"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "Geen ongelezen berichten."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "Opnieuw zoeken"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "Geen nieuwe berichten meer"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Geen nieuw bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "Geen nieuwe berichten."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "Geen nieuwe berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Geen gemarkeerde berichten meer"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Geen gelabelde berichten meer"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Geen gelabeld bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "Geen gelabelde berichten."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Geen gelablede berichten gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Berichten worden aangetrokken op onderwerp..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d verwijderd"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verplaatst"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ","
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d gekopieerd"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr "item(s) geselecteerd"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d"
@@ -6194,6 +6202,9 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "schrijven naar %s is mislukt.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Accountlijsten worden ververst..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/B_eeld/Codering/---"
 
diff --git a/po/pl.po b/po/pl.po
index b81427df..dcb01125 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.4 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+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"
@@ -65,11 +65,11 @@ msgstr ""
 "Licencji Publicznej GNU (GNU General Public License);je��li nie - napisz do "
 "Free Software Foundation, Inc., 675 Mass Ave,Cambridge, MA 02139, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Odczyt ustawie�� wszystkich kont...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -77,19 +77,19 @@ msgstr ""
 "Niekt坦re okna edycji s�� otwarte.\n"
 "Zamknij wszystkie okna edycji przed zmianami konta."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Otwieranie okna edycji konta...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Tworzenie okna edycji konta...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Edycja kont"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -97,8 +97,8 @@ msgstr ""
 "Nowe wiadomo��ci zostan�� sprawdzone w tej kolejno��ci. Zaznacz\n"
 "w kolumnie \"G\" konta, kt坦re maj�� by�� sprawdzone przez 'Odbierz wsz.'"
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -106,60 +106,66 @@ msgstr ""
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protok坦��"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Serwer"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Edycja"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " Usu�� "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "W d坦��"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "W g坦r��"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " Ustaw jako podstawowe konto "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Czy naprawd�� chcesz usun���� to konto?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Bez tytu��u"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Usu�� konto"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "Czy naprawd�� chcesz usun���� to konto?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Tak"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Nie"
 
@@ -228,7 +234,7 @@ msgstr "Wy��lij"
 msgid "Abort"
 msgstr "Przerwij"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -239,11 +245,11 @@ msgstr ""
 "(`%%h' zostanie zast��pione tym argumentem)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "Ukryte argumenty u甜ytkownika akcji"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -254,7 +260,7 @@ msgstr ""
 "(`%%u' will be replaced with the argument)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "Argumenty u甜ytkownika dla akcji"
 
@@ -262,7 +268,7 @@ msgstr "Argumenty u甜ytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do ksi��甜ki adresowej"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -348,8 +354,8 @@ msgstr "/_Adres/_Edycja"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usu��"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_Narz��dzia"
 
@@ -357,13 +363,13 @@ msgstr "/_Narz��dzia"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
 
@@ -380,10 +386,10 @@ msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -402,17 +408,17 @@ msgstr "/_Usu��"
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Ksi��甜ka adresowa"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Nazwa:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -583,7 +589,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Katalog"
 
@@ -607,7 +613,7 @@ msgstr "Wsp坦lny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Notatka"
 
@@ -615,7 +621,7 @@ msgstr "Notatka"
 msgid "Warning"
 msgstr "Ostrze甜enie"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "B����d"
 
@@ -627,31 +633,31 @@ msgstr "Tworzenie panelu z ostrze甜eniami...\n"
 msgid "Show this message next time"
 msgstr "Wy��wietl t�� wiadomo���� nast��pnym razem"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Pomara��czowy"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "Czerwony"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "R坦甜owy"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Jasnoniebieski"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Niebieski"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Zielony"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Br��zowy"
 
@@ -659,7 +665,7 @@ msgstr "Br��zowy"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Brak"
 
@@ -671,8 +677,8 @@ msgstr "/Dod_aj..."
 msgid "/_Remove"
 msgstr "/_Usu��"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/_W��a��ciwo��ci..."
 
@@ -833,8 +839,8 @@ msgstr "/_Widok/_Odpowiedz do"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_Widok/---"
 
@@ -861,7 +867,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -944,137 +950,142 @@ msgstr "/_Widok/_Strona kodowa/Uproszczony Chiny (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_Widok/_Strona kodowa/Uproszczony Chiny (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Widok/_Strona kodowa/Tradycyjny Chiny (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Widok/_Strona kodowa/Tradycyjny Chiny (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Widok/_Strona kodowa/Korea(EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Widok/_Strona kodowa/Tajlandia (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Widok/_Strona kodowa/Tajlandia (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_Narz��dzia/_Ksi��甜ka adresowa"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_Narz��dzia/_Szablon"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narz��dzia/Polecen_ia"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_Narz��dzia/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Narz��dzia/Edytuj za pomoc�� z_ewn��trznego edytora"
 
-#: src/compose.c:674
+#: src/compose.c:676
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Narz��dzia/Podpis _PGP"
 
-#: src/compose.c:675
+#: src/compose.c:677
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Narz��dzia/Szyfrowani_e GPG"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Nie mog�� pobra�� cz����ci tekstu\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "B����d formatu znacznika cytatu."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "B����d formatu odpowiedz/przeka甜 wiadomo����."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie mo甜na odczyta�� wielko��ci pliku %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie mo甜na odczyta�� %s."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomo����: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Nie mo甜na pobra�� cz����ci wiadomo��ci wielocz����ciowej."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [Edytowany]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Utw坦rz wiadomo����%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Utw坦rz wiadomo����%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Wy��lij"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomo���� nie posiada tematu. Czy wys��a�� j�� mimo tego ?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "nie mo甜na pobra�� listy odbiorc坦w."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1082,27 +1093,27 @@ msgstr ""
 "Nie podano konta pocztowego do wysy��ania wiadomo��ci.\n"
 "Nale甜y wybra�� konto przed wys��aniem."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "B����d podczas wysy��ania wiadomo��ci do %s."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Nie mo甜na zapisa�� wiadomo��ci do outbox."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nie mo甜na znale添�� klucza zwi��zanego z wybranym identyfikatorem klucza \"%s\"."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "nie mo甜na zmieni�� trybu pliku\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1112,140 +1123,140 @@ msgstr ""
 "%s na %s.\n"
 "Czy mimo to wys��a�� wiadomo����?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "nie mo甜na zapisa�� nag��坦wk坦w\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "Nie mo甜na usun���� starej wiadomo��ci\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomo��ci...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "nie mo甜na znale添�� katalogu kolejki\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "nie mo甜na zapisa�� wiadomo��ci do kolejki\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Wy��lij wiadomo����"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Wy��lij p坦添niej"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "Umie���� w katalogu kolejki i wy��lij p坦添niej"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Draft"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Zapisz w katalogu szablon坦w"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Wstaw"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Wstaw plik"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Do����cz"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Do����cz plik"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Wstaw podpis"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Edytor"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Edytuj w zewn��trznym edytorze"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Zawijanie linii"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Zawijaj wszystkie d��ugie linie"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "W��a��ciwo��ci"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "��cie甜ka"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywo��ania zewn��trznego edytora: \"%s\"\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1256,72 +1267,72 @@ msgstr ""
 "Czy wymusi�� zako��czenie procesu?\n"
 "identyfikator grupy proces坦w: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Identyfikator zako��czonej grupy proces坦w: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Plik tymczasowy: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Edycja: wej��cie z procesu monitoruj��cego\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Nie mo甜na uruchomi�� zewn��trznego edytora\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Nie mo甜na zapisa�� do pliku\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "B����dny odczyt z potoku\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Nie mo甜na wstawi�� wiadomo��ci do kolejki."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "Wybierz plik"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Porzu�� wiadomo����"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Wiadomo���� zosta��a zmieniona, czy porzuci�� j��?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Porzu��"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "do Draft"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosowa�� szablon \"%s\"?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Zamie��"
 
@@ -1482,12 +1493,12 @@ msgstr "Edytuj katalog"
 msgid "Input the new name of folder:"
 msgstr "Podaj now�� nazw�� katalogu:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Podaj nazw�� nowego katalogu:"
 
@@ -1656,160 +1667,156 @@ msgstr "b����d podczas zapisu konfiguracji do pliku\n"
 msgid "Select folder"
 msgstr "Wybierz katalog"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Wys��ane"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Kolejka"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "��mietnik"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Szablony"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "Nowy katalog"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie mo甜e wyst��pi�� w nazwie katalogu."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' ju甜 istnieje."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie mo甜na utworzy�� katalog '%s'."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/Utw坦rz _nowy katalog..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/_Zmie�� nazw�� katalogu..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/_Usu�� katalog"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 msgid "/Empty _trash"
 msgstr "/Opr坦甜nij ��mie_tnik"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/Sprawd添 nowe wiadomo��_ci"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/Odbuduj drz_ewo katalog坦w"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/Wy_szukaj wiadomo��ci..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 msgid "/Down_load"
 msgstr "/Pobierz"
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Subskrybuj grup�� news..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/Usu�� g_rup�� news"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Tworzenie widoku katalog坦w...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Nowy"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Ustawianie informacji o katalogu...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "Odbuduj drzewo katalog坦w"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Drzewo katalog坦w zostnie przebudowane. Kontynuowa��?"
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Odbudowywanie drzewa katalog坦w..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 msgid "Rebuilding of the folder tree failed."
 msgstr "B����d podczas odbudowywania drzewa katalog坦w."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Odbudowywanie wszystkich drzew katalog坦w..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie nowych wiadomo��ci we wszystkich katalogach..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Wybrano katalog %s\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pobieranie wiadomo��ci z %s..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "B����d podczas pobierania wiadomo��ci z `%s'."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1819,16 +1826,16 @@ msgstr ""
 "(je��li ma zosta�� utworzony katalog w celu przechowywania\n"
 "innych wiadomo��ci, nale甜y do����czy�� \"/\" na ko��cu nazwy)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowad添 now�� nazw�� dla '%s' :"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Zmie�� nazw�� katalogu"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1837,24 +1844,24 @@ msgstr ""
 "Wszystkie katalogi i wiadomo��ci w \"%s\" zostan�� usuni��te.\n"
 "Czy naprawd�� chcesz je usun����?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Usu�� katalog"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Nie mo甜na usun���� katalogu \"%s\"."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "Opr坦甜nij ��mietnik"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "Czy usun���� wszystkie wiadomo��ci ze ��mietnika?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1863,34 +1870,34 @@ msgstr ""
 "Czy naprawd�� usun���� skrzynk�� \"%s\" ?\n"
 "(Wiadomo��ci NIE zostan�� usuni��te z dysku)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Usu�� skrzynk��"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawd�� chcesz usun���� konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Usu�� konto IMAP4"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawd�� chcesz usun���� grup�� dyskusyjn�� \"%s\"?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Usu�� grup�� dyskusyjn��"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawd�� chcesz usun���� konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Usu�� konto grup dyskusyjnych"
 
@@ -1938,7 +1945,7 @@ msgstr "nieznany"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nie mo甜na pobra�� listy grup dyskusyjnych."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Gotowe."
 
@@ -2222,7 +2229,7 @@ msgstr "Importuj plik LDIF do ksi��甜ki adresowej"
 msgid "Prev"
 msgstr "Poprzednia"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "Nast��pna"
 
@@ -2313,7 +2320,7 @@ msgstr "Nawi��zywanie po����czenia z serwerem POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nie mo甜na nawi��za�� po����czenia z serwerem POP3: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
@@ -2343,7 +2350,7 @@ msgstr "Pobieranie rozmiaru wiadomo��ci (LIST)..."
 msgid "Deleting message %d"
 msgstr "Usuwanie wiadomo��ci %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Wychodzenie"
 
@@ -2386,7 +2393,8 @@ msgstr "Nie mo甜na zapisa�� pliku."
 msgid "Socket error."
 msgstr "B����d gniazda."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "Po����czenie zamkni��te przez zdalny komputer."
 
@@ -2403,11 +2411,11 @@ msgstr ""
 "Skrzynka jest zablokowana:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "B����d uwierzytelniania."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2416,7 +2424,7 @@ msgstr ""
 "B����d uwierzytelniania:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 #, fuzzy
 msgid "Session timed out."
 msgstr "przekroczenie czasu sesji\n"
@@ -2835,320 +2843,320 @@ msgstr "/_Widok/_Strona kodowa/Japonia (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Widok/_Strona kodowa/Japonia (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Widok/_Strona kodowa/Chiny (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Widok/_Strona kodowa/Korea (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/W_Widok/Ot_w坦rz w nowym oknie"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_Widok/P_oka甜 添r坦d��o"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_Widok/Poka甜 wszystkie na_g��坦wki"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_Widok/_Od��wie甜 podsumowanie"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_Wiadomo����"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 msgid "/_Message/Recei_ve"
 msgstr "/Wiado_mo����/Odbier_z"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Wiado_mo����/Odbier_z/Pobierz z bie甜��_cego konta"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Wiado_mo����/Odbier_z/Pobierz ze _wszystkich kont"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Wiadomo����/Odbier_z/Anuluj pob_ieranie"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 msgid "/_Message/Recei_ve/---"
 msgstr "/Wiado_mo����/Odbier_z/---"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/Wiado_mo����/Wy��lij wia_domo��ci z kolejki"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_Wiadomo����/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/Wiado_mo����/Tw坦rz _now�� wiadomo����"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/Wiado_mo����/_Odpowiedz"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/Wiado_mo����/Odpowied_z"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Wiado_mo����/Odpowied_z/w_szystkim"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Wiado_mo����/Odpowied_z/nadawc_y"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Wiado_mo����/Odpowiedz/_li��cie dyskusyjnej"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/Wiado_mo����/Przeka甜 da_lej"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/Wiado_mo����/Przeka甜 j_ako za����cznik"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/Wiado_mo����/Prze_kieruj"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/Wiado_mo����/_Przesu��..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/Wiado_mo����/_Kopiuj"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/Wiado_mo����/_Usu��"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/Wiado_mo����/_Zaznacz"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Wiado_mo����/_Zaznacz/_Zaznacz"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Wiado_mo����/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/Wiado_mo����/_Zaznacz/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Wiado_mo����/_Zaznacz/Zaznacz jako ni_eprzeczytane"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Wiado_mo����/_Zaznacz/Zaznacz jako przecz_ytane"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Wiado_mo����/_Zaznacz/Zaznacz wszystkie jako przecz_ytane"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/Wiado_mo����/Prz_eedytuj"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Narz��dzia/Dodaj nadawc�� do _ksi��甜ki adresowej"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Narz��dzia/_Filtruj wiadomo��ci w katalogu"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Narz��dzia/Filtruj zaznaczonne wiadomo��ci"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Narz��dzia/_Utw坦rz regu���� filtrowania"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Narz��dzia/_Utw坦rz regu���� filtrowania/_Automatycznie"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Narz��dzia/_Utw坦rz regu���� filtrowania/_Od"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Narz��dzia/_Utw坦rz regu���� filtrowania/_Do"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Narz��dzia/_Utw坦rz regu���� filtrowania/_Temat"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Wiado_mo����/Usu�� z_duplikowane wiadomo��ci"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_Narz��dzia/_Wykonaj"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/_Narz��dzia/Okno _log坦w"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/Konfigura_cja"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Konfigura_cja/Preferen_cje..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Konfigura_cja/Ustawienia _filtrowania"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/Konfigura_cja/_Szablon..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/Konfigura_cja/Poleceni_a..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/Konfigura_cja/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Konfigura_cja/_Preferencje bie甜��cego konta..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/Konfigura_cja/Utw坦rz _nowe konto..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Konfigura_cja/_Edytuj konta..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/Konfigura_cja/Zmie�� bie甜��_ce konto"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_Pomoc/_Podr��cznik"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoc/_Podr��cznik/Angi_elski"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoc/_Podr��cznik/_Japo��ski"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/Pomo_c/_FAQ"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoc/_FAQ/Angi_elskie"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoc/_FAQ/_Niemieckie"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoc/_FAQ/Hi_szpa��skie"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoc/_FAQ/_Francuskie"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoc/_FAQ/_W��oskie"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_Pomoc/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Tworzenie g��坦wnego okna...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno g��坦wne: b����d alokacji kolor坦w %d\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "gotowe.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Bez tytu��u"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "甜aden"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Zmiana typu rozdzielania okna z %d na %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr "Jeste�� offline. Przej���� do trybu online?"
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 msgid "Empty all trash"
 msgstr "Opr坦甜nij ��mietnik"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 msgid "Empty messages in all trash?"
 msgstr "Usun���� wszystkie wiadomo��ci ze ��mietnika?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Dodaj skrzynk��"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3158,16 +3166,16 @@ msgstr ""
 "Je��li zostanie podana istniej��ca skrzynka, b��dzie ona\n"
 "automatycznie skanowana."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" ju甜 istnieje."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3177,141 +3185,141 @@ msgstr ""
 "By�� mo甜e pliki ju甜 istniej�� lub brak jest wystarczaj��cych uprawnie�� do "
 "zapisu w tym miejscu."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Widok Katalog坦w"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomo��ci"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 msgid "/Reply to _all"
 msgstr "/Odpowiedz wszystkim"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 msgid "/Reply to _sender"
 msgstr "/Odpowiedz nadawcy"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _li��cie dyskusyjnej"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Prze_ka甜"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Przeka甜 jako za����cznik"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Odbierz"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Odbierz now�� poczt��"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Odbierz wsz."
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "Odbierz now�� poczt�� z wszystkich kont"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Wy��lij wiadomo��ci z kolejki"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Utw坦rz"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Utw坦rz now�� wiadomo����"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Odpowiedz na wiadomo����"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "Odp. na wsz."
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Odpowiedz na wszystkie"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Przeka甜"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Przeka甜 wiadomo���� dalej"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Usu�� wiadomo����"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "Nast��pna nieprzeczytana wiadomo����"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Preferencje"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "Wsp坦lne preferencje "
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Ustawienia konta"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr "Jeste�� offline. Kliknij ikon�� by przej���� do trybu online."
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr "Jeste�� online. Kliknij ikon��, by przej���� do trybu offline."
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Czy zako��czy�� program?"
 
@@ -3433,28 +3441,28 @@ msgstr "Osi��gni��to koniec wiadomo��ci; czy kontynuowa�� od pocz��tku?"
 msgid "Search finished"
 msgstr "Przeszukiwanie zako��czone"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Tworzenie widoku wiadomo��ci...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Za����czniki"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie mo甜na zapisa�� pliku \"%s\"."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Drukuj"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3463,7 +3471,7 @@ msgstr ""
 "Podaj polecenie wydruku:\n"
 "(\"%s\" zostanie zast��pione nazw�� pliku)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3902,7 +3910,7 @@ msgstr "Pobieranie wszystkich wiadomo��ci z serwera"
 msgid "Receive size limit"
 msgstr "Ograniczenie wielko��ci pobierania"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "KB"
 
@@ -3922,7 +3930,7 @@ msgstr "(Nieprzefiltrowane wiadomo��ci zostan�� zachowane w tym katalogu)"
 msgid "Authentication method"
 msgstr "Spos坦b uwierzytelniania"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Automatycznie"
 
@@ -3946,7 +3954,7 @@ msgstr "Generowanie identyrikatora wiadomo��ci"
 msgid "Add user-defined header"
 msgstr "Dodawanie nag��坦wka zdefiniowanego przez u甜ytkownika"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr "Edycja..."
 
@@ -4419,30 +4427,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Uproszczony Chiny (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Uproszczony Chiny (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradycyjny Chiny (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradycyjny Chiny (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chiny (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Tajlandia (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Tajlandia (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4451,11 +4464,11 @@ msgstr ""
 "Je��li wybrano \"Automatycznie\" to zostanie u甜yte\n"
 "optymalne kodowanie dla bie甜��cych ustawie�� lokalnych."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "Kodowanie przesy��anych danych"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4464,446 +4477,446 @@ msgstr ""
 "Opcja ta okre��la Content-Transfer-Encoding dla sytuacji,\n"
 "gdzie tre���� listu zawiera znaki nie-ASCII."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Oddzielenie podpisu"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Automatyczne wstawianie podpisu"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Automatyczne uruchamianie zewn��trznego edytora"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "Poziom Cofnij"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Zawijaj wiadomo��ci przy"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "znakach"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Zawijanie cytatu"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Zawijanie podczas wprowadzania"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Zawijanie przed wys��aniem"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "Automatyczne ustawianie konta dla odpowiedzi"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Cytowanie wiadomo��ci przy odpowiedzi"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "Przycisk Odpowiedz wysy��a odpowied添 na list�� dyskusyjn��"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Format odpowiedzi"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Znak cytowania"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Format przekazywania"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Opis symboli "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Czcionka"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "T��umaczenie nazwy nag��坦wka (jak np. 'Od:', 'Temat:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Wy��wietlanie ilo��ci nieprzeczytanych przy nazwie katalogu"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skracanie nazwy grup d��u甜szych ni甜 "
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "liter"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Widok listy wiadomo��ci"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Wy��wietlanie odbiorcy w kolumnie \"Od\" gdy u甜ytkownik jest nadawc��"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Rozwijanie w��tk坦w"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Format daty"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " Ustaw element wy��wietlania podsumowania... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "W����czenie kolorowania wiadomo��ci"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Wy��wietlanie znak坦w wielobajtowych jako ASCII (tylko japo��ski)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Wy��wietlanie panelu nag��坦wk坦w ponad oknem wiadomo��ci"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Wy��wietlanie kr坦tkich nag��坦wk坦w w widoku wiadomo��ci"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Odst��p mi��dzywierszowy"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "piksel(e)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Przewijanie"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "P坦�� strony"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Wyg��adzone przewijanie"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Krok"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Dopasowywanie rozmiaru do����czonych obrazk坦w"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 msgid "Display images as inline"
 msgstr "Poka甜 grafik�� w tre��ci"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Automatyczne sprawdzanie podpis坦w"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Wy��wietlanie wyniku sprawdzania podpisu w oknie komunikat坦w"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Tymczasowe zapami��tywanie has��a w pami��ci"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Wygasanie po"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "minuta(y)"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Warto���� \"0\" ustawi zapami��tywanie has��a na czas\n"
 " ca��ej sesji)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Przechwytywanie wej��cia podczas wprowadzania has��a"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Wy��wietlanie ostrze甜enia przy uruchamianiu gdy nie dzia��a GnuPG"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "Zawsze otwieraj wiadomo��ci gdy wybrano widok podsumowania."
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr ""
 "Otwieranie pierwszej nieprzeczytanej wiadomo��ci przy wchodzeniu do katalogu"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Zaznaczanie wiadomo��ci jako odczytanych tylko po otwarciu w nowym oknie"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "Przechodzenie do Poczty przychodz��cej po odbiorze poczty"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Natychmiastowe wykonywanie przy przenoszeniu lub kasowaniu wiadomo��ci"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Wiadomo��ci pozostan�� zaznaczone do wykonania\n"
 " gdy opcja ta jest wy����czona)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Okno dialogowe odbierania"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Wy��wietlanie okna dialogowego odbierania"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Zawsze"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr "Tylko przy r��cznym odbieraniu"
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Nigdy"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "Okno b����du pobierania wiadomo��ci nie jest wy��wietlane"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Zamykanie okna dialogowego odbierania po zako��czeniu"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " Ustaw dowi��zania klawiszy... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Polecenia zewn��trzne  (%s zostanie zast��pione nazw�� pliku / URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Przegl��darka Web"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "Dodawanie adresu do docelowego po dwukrotnym klikni��ciu"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "Podczas wyj��cia"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Potwierdzanie zamykania programu"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "Opr坦甜nianie ��mietnika przy zamykaniu programu"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Wy��wietlanie pytania przed opr坦甜nieniem"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Ostrzeganie je��li s�� wiadomo��ci w kolejce"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "Limit czasu gniazda I/O:"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "sekund(y)"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "skr坦cona nazwa dnia tygodnia"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "pe��na nazwa dnia tygodnia"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "skr坦cona nazwa miesi��ca"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "pe��na nazwa miesi��ca"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "preferowana data i czas dla ustawie�� lokalnych"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "numer roku (rok/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "dzie�� miesi��ca jako liczba dziesi��tna"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "godzina jako liczba dziesi��tna z u甜yciem czasu 24-ro godzinnego"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "godzina jako liczba dziesi��tna z u甜yciem czasu 12-to godzinnego"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "dzie�� roku jako liczba dziesi��tna"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "miesi��c jako liczba dziesi��tna"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "minuta jako liczba dziesi��tna"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "albo AM albo PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "sekunda jako liczba dziesi��tna"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "dzie�� tygodnia jako liczba dziesi��tna"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "preferowana data dla ustawie�� lokalnych"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "ostatnie dwie cyfry roku"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "rok jako liczba dziesi��tna"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "strefa czasowa jako nazwa lub skr坦t"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Wyszczeg坦lniacz"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "Przyk��ad"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Ustaw kolory wiadomo��ci"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Cytowany tekst - poziom pierwszy"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Cytowany tekst - poziom drugi"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Cytowany tekst - poziom trzeci"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "����cze URI"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Powtarzanie kolor坦w cytowania"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "Wybierz kolor dla pierwszego poziomu cytowania"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "Wybierz kolor dla drugiego poziomu cytowania"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "Wybierz kolor dla trzeciego poziomu cytowania"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "Wybierz kolor dla URI"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Opis symboli"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4927,11 +4940,11 @@ msgstr ""
 "Grupy news\n"
 "ID wiadomo��ci"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Wy��wietla expr je��li ustawiono x"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4945,7 +4958,7 @@ msgstr ""
 "Cia��o cytowanej wiadomo��ci bez sygnatury\n"
 "Literalny %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4957,15 +4970,15 @@ msgstr ""
 "Literalny nawias klamrowy otwieraj��cy\n"
 "Literalny nawias klamrowy zamykaj��cy"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Wyb坦r czcionki"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Dowi��zania klawiszy"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4975,11 +4988,11 @@ msgstr ""
 "Mo甜na r坦wnie甜 zmieni�� ka甜dy skr坦t klawiaturowy w menu\n"
 "naciskaj��c klawisze gdy kursor myszy znajduje si�� nad elementem."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "Domy��lny"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Dawny Sylpheed"
 
@@ -5047,193 +5060,188 @@ msgstr "Regu��y filtrowania"
 msgid "Enabled"
 msgstr "Aktywna"
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Naprawd�� chcesz usun���� t�� regu����?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Bez tytu��u"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Usu�� regu����"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 msgid "Filter rule"
 msgstr "Regu��a filtrowania"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr "Je��li dowolna z poni甜szych regu�� pasuje"
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr "Je��li wszystkie poni甜sze regu��y pasuj��"
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr "Podejmij dzia��ania:"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 msgid "Any header"
 msgstr "Dowolny nag��坦wek"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 msgid "Edit header..."
 msgstr "Edytuj nag��坦wek..."
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 msgid "Message body"
 msgstr "Tre���� wiadomo��ci"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr "Wiek"
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "zawiera"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 msgid "doesn't contain"
 msgstr "nie zawiera"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr "r坦wne"
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr "nie r坦wne"
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr "wi��ksze ni甜"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr "mniejsze ni甜"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr "d��u甜sze ni甜"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr "kr坦tsze ni甜"
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Przenie�� do"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 msgid "Copy to"
 msgstr "Kopiuj do"
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Nie odbieraj"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 msgid "Delete from server"
 msgstr "Usu�� z serwera"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 msgid "Set mark"
 msgstr "Zaznacz"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 msgid "Set color"
 msgstr "Ustaw kolor"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 msgid "Mark as read"
 msgstr "Zaznacz jako przeczytane"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 msgid "Forward as attachment"
 msgstr "Przeka甜 jako za����cznik"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 msgid "Redirect"
 msgstr "Przekieruj"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 msgid "Execute command"
 msgstr "Wykonaj polecenie"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr "Zatrzymaj sprawdzanie regu��ek"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 msgid "folder:"
 msgstr "katalog:"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 msgid "address:"
 msgstr "adres:"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 msgid "Edit header list"
 msgstr "Edytuj list�� nag��坦wk坦w"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 msgid "Headers"
 msgstr "Nag��坦wki"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 msgid "Header:"
 msgstr "Nag��坦wek:"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 msgid "Rule name is not specified."
 msgstr "Nie podano nazwy regu��ki."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Nie ustawiono polecenia."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Nie okre��lone Przeznaczenie."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Nie ustawiono polecenia."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 msgid "Action not exist."
 msgstr "Akcja nie istnieje."
 
@@ -5488,56 +5496,56 @@ msgstr "Pod����czanie"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "����czenie z serwerem SMTP: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "Wysy��anie HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "Uwierzytelnianie"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "Wysy��anie wiadomo��ci..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "Wysy��anie EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "Wysy��anie MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "Wysy��anie"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "Wysy��anie RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "Wysy��anie DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Wychodzenie..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Wysy��anie wiadomo��ci (%d / %d)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "Wysy��anie wiadomo��ci"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "B����d podczas wysy��ania wiadomo��ci."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5844,136 +5852,136 @@ msgstr "Nr"
 msgid "Creating summary view...\n"
 msgstr "Tworzenie widoku podsumowania...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Znacznik procesu"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "brak niekt坦rych znacznik坦w, czy wykona�� ?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Skanowanie katalogu (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Nie ma wi��cej nieprzeczytanych wiadomo��ci"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomo��ci.\n"
 "Czy rozpocz���� wyszukiwanie od ko��ca?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "Brak nieprzeczytanych wiadomo��ci."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomo��ci.\n"
 "Czy przej���� do nast��pnego folderu?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "Szukaj ponownie"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "Nie ma wi��cej nowych wiadomo��ci"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nowych wiadomo��ci.\n"
 "Czy rozpocz���� wyszukiwanie od ko��ca?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "Brak nowych wiadomo��ci"
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Nie znaleziono nowych wiadomo��ci.\n"
 "Czy przej���� do nast��pnego folderu?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Nie ma wi��cej zaznaczonych wiadomo��ci"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomo��ci.\n"
 "Czy rozpocza�� wyszukiwanie od ko��ca?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "Brak zaznaczonych wiadomo��ci"
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomo��ci.\n"
 "Czy rozpocz���� wyszukiwanie od pocz��tku?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Nie ma wi��cej etykietowanych wiadomo��ci"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomo��ci.\n"
 "Czy rozpocz���� wyszukiwanie od ko��ca?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "Brak etykietowanych wiadomo��ci."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomo��ci.\n"
 "Czy rozpocz���� wyszukiwanie od pocz��tku?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "����czenie wiadomo��ci wg tematu..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d usuni��to"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d przeniesiono"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopiowano"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " element(坦w) wybrany(o)"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nowych, %d nieprzeczytanych, razem %d (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nowych, %d nieprzeczytanych, %d razem"
@@ -6143,6 +6151,9 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "b����d zapisu do %s.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Odbudowywanie wszystkich drzew katalog坦w..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_Widok/_Strona kodowa/---"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3c8ada46..b33d3dde 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: 2002-07-15 13:06-0300\n"
 "Last-Translator: Andr辿 Casteliano <digitalcoder@users.sourceforge.net>\n"
 "Language-Team: Andr辿 Casteliano <digitalcoder@users.sourceforge.net> Isa鱈as "
@@ -66,30 +66,30 @@ msgstr ""
 "programa; caso n達o, escreva para a Free Software Foundation, Inc., \n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Lendo as configura巽探es de cada conta...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgstr ""
 "Por favor feche todas as janelas de composi巽達o antes de editar as contas."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Abrindo janela de edi巽達o de conta...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Criando janela de edi巽達o de conta...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Editar contas"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -97,8 +97,8 @@ msgstr ""
 "Mensagens novas ser達o pegas nessa ordem. Marque as caixas\n"
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -106,60 +106,66 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Servidor"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Editar"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " Apagar "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Acima"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " Marcar como conta padr達o "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Voc棚 realmente deseja apagar esta conta?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Sem t鱈tulo"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Apagar conta"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "Voc棚 realmente deseja apagar esta conta?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Sim"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+N達o"
 
@@ -228,7 +234,7 @@ msgstr " Enviar "
 msgid "Abort"
 msgstr "Abortar"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -238,11 +244,11 @@ msgstr ""
 "Digite o comando de impress達o:\n"
 "(`%s' ser叩 sustitu鱈do pelo arquivo)"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -252,7 +258,7 @@ msgstr ""
 "Digite o comando de impress達o:\n"
 "(`%s' ser叩 sustitu鱈do pelo arquivo)"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr ""
 
@@ -260,7 +266,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Adicionar ao Livro de endere巽os"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Endere巽o"
@@ -346,8 +352,8 @@ msgstr "/_Endere巽o/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Endere巽o/_Apagar"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
@@ -355,13 +361,13 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/_Ajuda/_Sobre"
 
@@ -378,10 +384,10 @@ msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -400,17 +406,17 @@ msgstr "/_Apagar"
 msgid "E-Mail address"
 msgstr "Endere巽o de e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Livro de endere巽os"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -580,7 +586,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Pasta"
 
@@ -604,7 +610,7 @@ msgstr "Endere巽os comuns"
 msgid "Personal address"
 msgstr "Endere巽os pessoais"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Notifica巽達o"
 
@@ -612,7 +618,7 @@ msgstr "Notifica巽達o"
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Erro"
 
@@ -624,31 +630,31 @@ msgstr "Criando a tela de alerta...\n"
 msgid "Show this message next time"
 msgstr "Mostrar essa mensagem da pr坦xima vez"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Laranja"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "Vermelho"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Azul c辿u"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Azul"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Verde"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Marrom"
 
@@ -656,7 +662,7 @@ msgstr "Marrom"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Nenhuma"
 
@@ -668,8 +674,8 @@ msgstr "/_Adicionar"
 msgid "/_Remove"
 msgstr "/_Remover"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Propriedades..."
@@ -835,8 +841,8 @@ msgstr "/E_xibir/_Responder para"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/E_xibir/---"
 
@@ -863,7 +869,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -946,140 +952,145 @@ msgstr "/E_xibir/_Conjunto de ca_racteres/Chin棚s simplificado (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/E_xibir/_Conjunto de ca_racteres/Chin棚s simplificado (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Conjunto de ca_racteres/Chin棚s tradicional (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/E_xibir/_Conjunto de ca_racteres/Chin棚s tradicional (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Conjunto de ca_racteres/Coreano (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Conjunto de ca_racteres/Thai (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Conjunto de ca_racteres/Thai (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Livro de endere巽os"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_A巽探es"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar com editor e_xterno"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/_A巽探es"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensagem/_Encriptar"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo n達o existe\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "N達o foi poss鱈vel obter o texto\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de cita巽達o."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s n達o existe\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "N達o foi poss鱈vel especificar o tamanho de %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s est叩 vazio."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "N達o foi poss鱈vel ler %s."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "N達o foi poss鱈vel obter alguma(s) parte(s) dessa mensagem."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [Editado]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compondo mensagem%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Compondo mensagem%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Destinat叩rio n達o especificado."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Enviar"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "Assunto vazio. Enviar assim mesmo?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "n達o pude obter a lista de destinat叩rios."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1087,26 +1098,26 @@ msgstr ""
 "Conta para envio de mensagem n達o est叩 especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocorreu um erro enquanto tentava postar a mensagem para %s ."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "N達o foi poss鱈vel armazenar a mensagem na caixa de sa鱈da."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "N達o foi poss鱈vel obter nenhuma chave associada ao ID Selecionado '%s'."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "N達o foi poss鱈vel modificar as permiss探es do arquivo\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1115,141 +1126,141 @@ msgstr ""
 "N達o foi poss鱈vel converter o c坦digo de caracteres da mensagem.\n"
 "Enviar assim mesmo?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "n達o foi poss鱈vel escrever o cabe巽alho\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "n達o posso remover a mensagem antiga\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "colocando mensagem na fila...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "n達o foi poss鱈vel encontrar a pasta da fila\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "N達o foi poss鱈vel por a mensagem na fila\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composi巽達o...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Enviar depois"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "Por na 'fila de sa鱈da' e enviar depois"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Rascunho"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Inserir arquivo"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Anexar"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Inserir assinatura"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Editar com um editor externo"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Quebra de linha"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas grandes"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inv叩lido."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo n達o existe ou est叩 vazio."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 #, fuzzy
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Codifica巽達o"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linha de comando do editor externo 辿 inv叩lida: '%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1260,72 +1271,72 @@ msgstr ""
 "Deseja matar o processo?\n"
 "Id. do grupo do processo : %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Terminado grupo de processo id.: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Arquivo tempor叩rio: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Compositor: entrada para monitorar processo\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "N達o foi poss鱈vel executar o editor externo\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "N達o foi poss鱈vel gravar o arquivo\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Fallhou ao ler o pipe\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "N達o foi poss鱈vel por a mensagem na fila."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Descartar mensagem"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Esta mensagem foi modificada. Deseja descart叩-la ?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "como rascunho"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Substituir"
 
@@ -1487,12 +1498,12 @@ msgstr "Editar pasta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -1663,163 +1674,159 @@ msgstr "falhou ao gravar a configura巽達o no arquivo\n"
 msgid "Select folder"
 msgstr "Selecione uma pasta"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Enviadas"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Fila de sa鱈da"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' n達o pode ser usado no nome da pasta."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "A pasta `%s' j叩 existe."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "n達o foi poss鱈vel criar a pasta `%s'."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/Criar _nova pasta..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/_Renomear pasta..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/_Apagar pasta"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/_Buscar novas mensagens"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/_Atualizar 叩rvore de pastas"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/_Procurar mensagens..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "N達o h叩 mensagens n達o lidas."
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Assinar grupo de not鱈cias..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo de not鱈cias"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Criando visualizador de pasta...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Nova"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "N達o lido"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Configurando informa巽探es da pasta...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Configurando informa巽探es da pasta..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "/_Atualizar 叩rvore de pastas"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Atualizando visualizador de pasta..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Atualizando visualizador de pasta..."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Revisando todas as 叩rvores de pastas..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Checar novas mensagens em todas as pastas..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pasta %s selecionada\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensagem"
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocorreu um erro enquanto tentava postar a mensagem para %s ."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1829,16 +1836,16 @@ msgstr ""
 "(se voc棚 quer criar uma pasta para armazenar subpastas.\n"
 " adicione `/' no final do nome)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1847,24 +1854,24 @@ msgstr ""
 "Todas as pastas e mensagens sob `%s' ser達o apagados.\n"
 "Confirma a exclus達o?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "n達o foi poss鱈vel excluir a pasta `%s'."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "Limpar todas as mensagens na lixeira ?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1873,34 +1880,34 @@ msgstr ""
 "Realmente remover a caixa de correio `%s' ?\n"
 "(As mensagens N��O s達o apagadas do disco)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Realmente apagar conta IMAP4 `%s' ?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Apagar conta IMAP4"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Realmente apagar o grupo de not鱈cias `%s'?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Apagar grupo de not鱈cias"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Realmente apagar o grupo de not鱈cias `%s'?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Apagar conta de grupo de not鱈cias"
 
@@ -1948,7 +1955,7 @@ msgstr "desconhecido"
 msgid "Can't retrieve newsgroup list."
 msgstr "N達o foi poss鱈vel obter a lista de grupos de not鱈cias."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Feito."
 
@@ -2237,7 +2244,7 @@ msgstr "Importar arquivo LDIF para o Livro de Endere巽os"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "Pr坦xima"
 
@@ -2328,7 +2335,7 @@ msgstr "Conectando ao servidor POP3: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "N達o foi poss鱈vel se conectar ao servidor POP3: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
@@ -2358,7 +2365,7 @@ msgstr "Obtendo o n炭mero de novas mensagens (LIST)..."
 msgid "Deleting message %d"
 msgstr "Apagando mensagem %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Saindo"
 
@@ -2400,7 +2407,8 @@ msgstr "N達o foi poss鱈vel gravar o arquivo."
 msgid "Socket error."
 msgstr "erro de socket."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2415,19 +2423,19 @@ msgid ""
 "%s"
 msgstr "Caixa de correio est叩 travada."
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 #, fuzzy
 msgid "Authentication failed."
 msgstr "M辿todo de Autentica巽達o"
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "M辿todo de Autentica巽達o"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr ""
 
@@ -2846,329 +2854,329 @@ msgstr "/E_xibir/_Conjunto de ca_racteres/Japon棚s (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Conjunto de ca_racteres/Japon棚s (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Conjunto de ca_racteres/Chin棚s (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Conjunto de ca_racteres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma n_ova janela"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Ver _fonte"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/E_xibir/_Mostrar todos os cabe巽alhos"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/E_xibir/A_tualizar sum叩rio"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_Mensagem"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensagem/Ed_itar novamente"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensagem/Receber de _todas as contas"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensagem/Receber de _todas as contas"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Mensagem/_Cancelar recebimento"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensagem/Ed_itar novamente"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensagem/Enviar mensagens da _fila"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensagem/Compor _nova mensagem"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/_Responder"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/_Responder para"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Mensagem/Responder para/_todos"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder para/_quem enviou"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Mensagem/Responder para/_lista"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encam_inhar"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensagem/Redire_cionar"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_Mensagem/Mo_ver..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/_Mensagem/_Copiar..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_Mensagem/_Apagar"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_Mensagem/_Marcar"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensagem/_Marcar/_Marcar"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensagem/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensagem/_Marcar/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensagem/_Marcar/Marcar como _n達o lida"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensagem/_Marcar/Marcar como l_ida"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensagem/_Marcar/Marcar todas como _lidas"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensagem/Ed_itar novamente"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Adicionar remetente ao Livro de _Endere巽os"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/_Filtrar mensagens"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar mensagens"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Criar regra de filtro"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Criar regra de filtro/_Automaticamente"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _remtente"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _destinat叩rio"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo A_ssunto"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/_Apagar mensagens duplicadas"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Janela de log"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Configura巽達o"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configura巽達o/_Prefer棚ncias comuns..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configura巽達o/Configura巽達o de _filtros..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_Configura巽達o/_Modelo..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configura巽達o/_A巽探es..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Configura巽達o/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configura巽達o/Prefer棚ncias da conta _atual..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configura巽達o/Criar uma _nova conta..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configura巽達o/_Editar contas..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configura巽達o/_Mudar conta atual"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_Ajuda/_Manual"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajuda/_Manual/_Ingl棚s"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajuda/_Manual/_Japon棚s"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/_Ajuda/_FAQ"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajuda/_FAQ/_Ingl棚s"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajuda/_FAQ/_Alem達o"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajuda/_FAQ/_Espanhol"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ajuda/_FAQ/_Franc棚s"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_Ajuda/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Criando janela principal...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "Pronto.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Sem t鱈tulo"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Mudando tipo de separa巽達o de janela de %d para %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Esvaziar lixeira"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Limpar todas as mensagens na lixeira ?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3178,16 +3186,16 @@ msgstr ""
 "Se uma caixa de correio existente 辿 especificada, ela ser叩\n"
 "mapeada automaticamente."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' j叩 existe."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3197,144 +3205,144 @@ msgstr ""
 "Talvez alguns arquivos j叩 existam, ou voc棚 n達o tem permiss達o para escrever "
 "l叩."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vis達o de Pastas"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vis達o de Mensagens"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "Res_ponder para/_quem enviou"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "Responder para/_lista"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/En_caminhar"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Baixar"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Incorporar mensagens novas"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Baixar tudo"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "Incorporar novas mensagens de todas as contas"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Escrever nova mensagem"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Responder �� Mensagem"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "Responder todas"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Encaminhar a mensagem"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Apagar a mensagem"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Executar"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Executar os processos marcados"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "Pr坦xima mensagem n達o lida"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Prefer棚ncias"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "Prefer棚ncias comuns"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Conta"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Prefer棚ncias da conta"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Sair do programa?"
 
@@ -3456,28 +3464,28 @@ msgstr "Fim da mensagem atingido; continuar do in鱈cio?"
 msgid "Search finished"
 msgstr "Procura conclu鱈da"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Criando visualizador de mensagem...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Texto"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Anexos"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "N達o foi poss鱈vel salvar arquivo `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3486,7 +3494,7 @@ msgstr ""
 "Digite o comando de impress達o:\n"
 "(`%s' ser叩 sustitu鱈do pelo arquivo)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3930,7 +3938,7 @@ msgstr "Receber todas as mensagens no servidor"
 msgid "Receive size limit"
 msgstr "Limite de tamanho de recebimento"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr ""
 
@@ -3950,7 +3958,7 @@ msgstr "(Mensagens n達o filtradas ser達o guardadas nesta pasta)"
 msgid "Authentication method"
 msgstr "M辿todo de Autentica巽達o"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Autom叩tico"
 
@@ -3974,7 +3982,7 @@ msgstr "Gerar Message-ID"
 msgid "Add user-defined header"
 msgstr "Adicionar cabe巽alho do usu叩rio"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4446,30 +4454,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Chin棚s simplificado (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Chin棚s simplificado (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Chin棚s tradicional (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chin棚s tradicional (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chin棚s (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4478,129 +4491,129 @@ msgstr ""
 "Se `Autom叩tico' for selecionado, a melhor codifica巽達o\n"
 "para o locale atual ser叩 usada."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Quebrar antes de enviar"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Separador de assinatura"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Inserir automaticamente"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Executar o editor externo automaticamente"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "N鱈vel de desfazer"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Quebrar mensagens em"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "caracteres"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Quebrar quote"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Quebrar na entrada"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Quebrar antes de enviar"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "Escolher conta para respostas automaticamente"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Quotar mensagem ao responder"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "Bot達o de responder chama resposta para a lista"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Formato de resposta"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Marca de cita巽達o"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Formato de Mensagem Encaminhada"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Descri巽達o dos s鱈mbolos "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Fonte"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traduzir cabe巽alhos (como `De:', `Assunto:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Exibir n炭mero de n達o lidas pr坦ximas ao nome da pasta"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar newsgroups maiores que"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Vis達o de Sum叩rio "
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Mostrar remetente na coluna `De' se ele for o mesmo"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Expandir threads"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Formato de data"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " Elementos vis鱈veis no cabe巽alho... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Permitir cores na mensagem"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4608,329 +4621,329 @@ msgstr ""
 "Exibir alfabetos de 2-bytes e num辿ricos com \n"
 "caracteres ASCII (1-byte)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Exibir cabe巽alho acima da vis達o da mensagem"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Cabe巽alhos pequenos na visualiza巽達o da mensagem"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Linha de espa巽o"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Rolagem"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Meia p叩gina"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Rolagem silenciosa"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Passo"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar imagens em anexo"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "/E_xibir configura巽達o de cabe巽alho"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Automaticamente checar assinatura"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Exibir resultado de checagem de assinatura em uma janela popup"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Armazenar senha temporariamente na mem坦ria"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Expirado depois"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "minuto(s)"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Definindo '0' ir叩 guardar a senha para\n"
 " toda a sess達o)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Obter entrada quando informando uma passphrase"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Exibir aviso na inicializa巽達o se o GnuPG n達o funciona"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nenhum arquivo de mensagem selecionado."
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Abrir a primeira mensagem n達o lida ao abrir uma pasta"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "Somente marcar a mensagem como lida quando aberta em uma nova janela"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "Ir para Caixa de Entrada depois de receber novas mensagens"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar imediatamente enquanto movendo ou apagando mensagens"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Mensagens ser達o marcadas at辿 a execu巽達o\n"
 " se isto estiver desligado)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Di叩logo de recep巽達o"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Exibir di叩logo de recep巽達o"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "N達o mostrar di叩logo de erro no caso de erros ao receber"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Fechar di叩logo de recep巽達o quando terminar"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " Definir atalhos de teclado... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Comandos externos (%s ser叩 sustituido pelo nome do arquivo)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Navegador Web"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "Adicionar endere巽o para o destino quando clicado duas vezes"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "Ao sair"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Confirmar ao sair"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "Esvaziar lixeira ao sair"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Pergunte antes de esvaziar"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Avise se existirem mensagens na fila"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "o nome completo do m棚s abreviado"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "o nome completo do dia da semana"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "o nome do m棚s abreviado"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "o nome completo do m棚s"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "a data 辿 hora preferida para a localiza巽達o atual"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "o n炭mero do s辿culo (ano/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "o dia do m棚s como um n炭mero decimal"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "a hora como um n炭mero decimal usando um rel坦gio de 24 horas"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "a hora como um n炭mero decimal usando um rel坦gio de 12 horas"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano como um n炭mero decimal"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "o m棚s como um n炭mero decimal"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "o minuto como um n炭mero decimal"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "ou AM ou PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "o segundo como um n炭mero decimal"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como um n炭mero decimal"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para localiza巽達o atual"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "os 炭ltimos dois d鱈gitos de um ano"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "o ano como um n炭mero decimal"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "o zona de tempo ou nome ou abrevia巽達o"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Descri巽達o"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Defina as cores de mensagens"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Texto Quotado - Primeiro N鱈vel"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Texto Quotado - Segundo N鱈vel"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Texto Quotado - Terceiro N鱈vel"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "Liga巽達o URI"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Reaproveitar cores de quote"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "Escolher cor para quota巽達o n鱈vel 1"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "Escolher cor para quota巽達o n鱈vel 2"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "Escolher cor para quota巽達o n鱈vel 3"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "Escolher cor para URI"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Descri巽達o dos s鱈mbolos"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4955,11 +4968,11 @@ msgstr ""
 "Message-ID\n"
 "%"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Se x estiver definido, mostra expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4973,7 +4986,7 @@ msgstr ""
 "Corpo da mensagem citada sem assinatura\n"
 "%% literal"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4985,15 +4998,15 @@ msgstr ""
 "Abre-chave literal\n"
 "Fecha-chave literal"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Sele巽達o de fonte"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Atalhos de teclado"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -5004,11 +5017,11 @@ msgstr ""
 "pressionando qualquer tecla enquanto coloca o ponteiro\n"
 "do mouse sobre o item."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "Padr達o"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Sylpheed antigo"
 
@@ -5076,214 +5089,209 @@ msgstr "Configura巽達o de filtros"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Quer realmente apagar esta regra?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Sem t鱈tulo"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Apagar regra"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "Apagar regra"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "Todos os cabe巽alhos"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "Cabe巽alho"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "Mensagem"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "cont辿m"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "n達o cont辿m"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "Mover para Baixo"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Copiar..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "N達o receber"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "Apagar servidor de not鱈cias"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "Notas"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "Defina as cores de mensagens"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Marcar/Marcar como _lida"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/Re_direcionar"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "Executar"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "Pasta"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "Endere巽o"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "Cabe巽alho"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "Cabe巽alho"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "Cabe巽alho"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Destinat叩rio n達o especificado."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Linha de comando n達o definida."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Destinat叩rio n達o especificado."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 #, fuzzy
 msgid "Invalid action exists."
 msgstr "M棚s inv叩lido\n"
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Linha de comando n達o definida."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: o arquivo n達o existe\n"
@@ -5541,57 +5549,57 @@ msgstr "Conectando"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectando com o servidor SMTP: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 #, fuzzy
 msgid "Sending message..."
 msgstr "Enviando mensagem"
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "Enviando EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "Enviando"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "Enviando RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "Enviando DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Saindo..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviando mensagem (%d / %d bytes)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "Ocorreu um erro ao enviar suas mensagens."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5898,120 +5906,120 @@ msgstr "N達o."
 msgid "Creating summary view...\n"
 msgstr "Criando visualizador de sum叩rios...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Procesar marca"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Algumas marcas foram deixadas. Process叩-las?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando pasta (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "N達o h叩 mais mensagens n達o lidas"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Nenhuma mensagens n達o lidas encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "N達o h叩 mensagens n達o lidas."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "N達o h叩 mensagens n達o lidas. Ir para a pr坦xima pasta?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "Procurar novamente"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "N達o h叩 mais mensagens novas"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Nenhuma mensagens nova encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "N達o h叩 mensagens novas."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "N達o h叩 mensagens novas. Ir para a pr坦xima pasta?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "N達o h叩 mais mensagens marcadas"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "N達o foram encontradas mensagens marcadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "N達o h叩 mensagens marcadas"
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "N達o foram encontradas mensagens marcadas. Procurar a partir do in鱈cio?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "N達o h叩 mais mensagens etiquetadas"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "N達o foram encontradas mensagens etiquetadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "N達o h叩 mensagens etiquetadas."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenhuma mensagem n達o lida encontrada. Procurar do in鱈cio ?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensagens por assunto..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d apagadas"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidas"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiadas"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " item(ns) selecionado(s)"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d n達o lidas, %d  no total (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d n達o lidas, %d no total"
@@ -6183,6 +6191,9 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "Erro ao gravar em %s.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Revisando todas as 叩rvores de pastas..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/E_xibir/Conjunto de ca_racteres/---"
 
diff --git a/po/ro.po b/po/ro.po
index 97c35fb8..dbd5a823 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: 2000-08-28\n"
 "Last-Translator: Little Dragon <littledragon@altern.org>\n"
 "Language-Team: Little Dragon <littledragon@altern.org>\n"
@@ -66,11 +66,11 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
 "MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Citire configura釘ia conturilor...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -79,19 +79,19 @@ msgstr ""
 "V�� rug��m s�� 樽nchide釘i toate ferestrele de compunere 樽nainteaedit��rii de "
 "conturi."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Deschidere fereastr�� de editare...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Creare fereastr�� de editarea conturilor...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Editare de conturi"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -100,8 +100,8 @@ msgstr ""
 "checkboxurile din coloana `G' pentru a activa recep釘ionarea\n"
 "mesajelor de comanda `Ia tot'."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -109,61 +109,67 @@ msgstr ""
 msgid "Name"
 msgstr "Nume"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Ad��ugare"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Editare"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " ��tergere "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Jos"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Sus"
 
-#: src/account.c:708
+#: src/account.c:754
 #, fuzzy
 msgid " Set as default account "
 msgstr " Setare drept cont curent "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Sunte釘i sigur c�� dori釘i s�� ��terge釘i acest cont ?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Neintitulat"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "��tergere cont"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "Sunte釘i sigur c�� dori釘i s�� ��terge釘i acest cont ?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Nu"
 
@@ -229,7 +235,7 @@ msgstr "Trimitere"
 msgid "Abort"
 msgstr "Despre"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -239,11 +245,11 @@ msgstr ""
 "Introduce釘i linia de comand�� pentru imprimare:\n"
 "('%s' va fi 樽nlocuit cu numele fi��ierului)"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -253,7 +259,7 @@ msgstr ""
 "Introduce釘i linia de comand�� pentru imprimare:\n"
 "('%s' va fi 樽nlocuit cu numele fi��ierului)"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr ""
 
@@ -261,7 +267,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Ad��ugare 樽n agend��"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres��"
@@ -348,8 +354,8 @@ msgstr "/_Adres��/_Editare"
 msgid "/_Address/_Delete"
 msgstr "/_Adres��/��_tergere"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 #, fuzzy
 msgid "/_Tools"
 msgstr "/_Utilitare"
@@ -358,13 +364,13 @@ msgstr "/_Utilitare"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Utilitare/Importare fi��ier _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/A_jutor"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/A_jutor/_Despre"
 
@@ -384,10 +390,10 @@ msgid "/New _Folder"
 msgstr "/_Director nou"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -406,17 +412,17 @@ msgstr "/��_tergere"
 msgid "E-Mail address"
 msgstr "Adres�� E-Mail"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Agend��"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr " Nume:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -587,7 +593,7 @@ msgid "Group"
 msgstr "Group��"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Director"
 
@@ -611,7 +617,7 @@ msgstr "Adresse comun��:"
 msgid "Personal address"
 msgstr "Adresse personal��:"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Informa釘ie"
 
@@ -619,7 +625,7 @@ msgstr "Informa釘ie"
 msgid "Warning"
 msgstr "Avertisment"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Eroare"
 
@@ -631,31 +637,31 @@ msgstr "Creare dialog de avertisment...\n"
 msgid "Show this message next time"
 msgstr "Acest mesaj va ap��rea ��i data viitoare"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Portocaliu"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "Ro��u"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Roz"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Albastru Cer"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Albastru"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Verde"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Maro"
 
@@ -663,7 +669,7 @@ msgstr "Maro"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Niciunul"
 
@@ -675,8 +681,8 @@ msgstr "/_Ad��ugare..."
 msgid "/_Remove"
 msgstr "/��_tergere"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Propriet��釘i..."
@@ -845,8 +851,8 @@ msgstr "/_Vedere/_R��spuns"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_Vedere/---"
 
@@ -873,7 +879,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -956,145 +962,150 @@ msgstr "/_Mesaj/Set de _caractere/Chinezesc Simplificat (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_Mesaj/Set de _caractere/Chinezesc Simplificat (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc Tradi釘ional (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc Tradi釘ional (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Mesaj/Set de _caractere/Corean (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc (ISO-2022-_CN)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Mesaj/Set de _caractere/Chirilic (Windows-1251)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Utilitare/_Agend��"
 
-#: src/compose.c:667
+#: src/compose.c:669
 #, fuzzy
 msgid "/_Tools/_Template"
 msgstr "/_Utilitare/_Modele"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/E_xecutare"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 #, fuzzy
 msgid "/_Tools/---"
 msgstr "/_Utilitare/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editare/Editare cu un editor e_xtern"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/E_xecutare"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Message/Cr_iptare"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fi��ierul nu exist��\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 #, fuzzy
 msgid "Can't get text part\n"
 msgstr "xover imposibil\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Eroare de formatare a cita釘iei."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Eroare de formatare a r��spunsului/mesajului 樽naintat."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Fi��ierul %s nu exist��\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ob釘inerea dimensiunii fi��ierului %s este imposibil��\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Fi��ierul %s este gol\n"
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "nu poate fi creat %s\n"
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Citirea unei par釘i din mesajul multipart este imposibil��."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [Editat] "
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compunere mesaj%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Compunere mesaj%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu a fost specificat."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Trimitere"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "nu pot ob釘ine lista destinatarilor."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1102,168 +1113,168 @@ msgstr ""
 "Nu a fost specificat contul de pe care se dore��te trimiterea de mail.\n"
 "V�� rug��m s�� selecta釘i un cont 樽nainte de a trimite."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A avut loc o eroare la 樽ncercarea de a posta mesajul pe %s ."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Salvarea mesajului 樽n outbox este imposibil��."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "schimbarea permisiunilor fi��ierului este imposibil��\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
 "Send it as %s anyway?"
 msgstr "Convertirea codific��rii mesajului este imposibil��."
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "scrierea antetelor este imposibil��\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "��tergerea mesajului vechi a e��uat\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "punere mesaj 樽n lista de a��teptare...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "directorul nu a putut fi selectat: %s\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "punerea mesajului 樽n lista de a��teptare este imposibil��\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Creare fereastra de compunere...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Trimitere mesaj"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Mai t但rziu"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "Punere 樽n lista de a��teptare ��i trimitere mai t但rziu"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Salvare"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Salvare"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Inserare"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Isertion fi��ier"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Ata��ament"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Ata��are fi��ier"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Semn��tur��"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Inserare semn��tur��"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Editare cu editor extern"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "T��iere linii"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "T��iere toate liniile lungi"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Tip MIME invalid."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "Fi��ierul nu exist�� sau este gol."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 #, fuzzy
 msgid "Properties"
 msgstr "Proprietate"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Numele fi��ierului"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comand�� este invalid��: '%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1274,73 +1285,73 @@ msgstr ""
 "Dori釘i terminarea for釘at�� a procesului ?\n"
 "process group id: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Procesul a fost terminat: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Fi��ier temporar: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Compunere: introducere din proces monitorizat\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Editorul extern nu poate fi executat\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Scrierea 樽n fi��ier este imposibil��\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Citirea din pipe a e��uat\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Este imposibil�� punerea mesajului 樽n lista de a��teptare."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "Selectare fi��ier"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "Selectare fi��ier"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Anulare mesaj"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Acest mesaj a fost modificat. Dori釘i sa anula釘i schimb��rile ?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Anulare schimb��ri"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "Salvare"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Sunte釘i sigur c�� dori釘i s�� ��terge釘i aceast�� regul�� ?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 #, fuzzy
 msgid "Apply template"
 msgstr "��tergere mesaj"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 #, fuzzy
 msgid "Replace"
 msgstr "/_Utilitare/_Modele"
@@ -1502,12 +1513,12 @@ msgstr "Editare director"
 msgid "Input the new name of folder:"
 msgstr "Introduce釘i noul nume al directorului:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Director nou"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Introduce釘i numele noului director:"
 
@@ -1678,175 +1689,170 @@ msgstr "scrierea configura釘ie 樽n fi��ier a e��uat\n"
 msgid "Select folder"
 msgstr "Selectare director"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 #, fuzzy
 msgid "Sent"
 msgstr "Trimitere"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Lista de a��teptare"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Gunoi"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 #, fuzzy
 msgid "Drafts"
 msgstr "Salvare"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 #, fuzzy
 msgid "NewFolder"
 msgstr "Director nou"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nu poate fi inclus 樽n numele directorului."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Directorul '%s' exist�� deja."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 #, fuzzy
 msgid "/Create _new folder..."
 msgstr "/Creare director _nou"
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 #, fuzzy
 msgid "/_Rename folder..."
 msgstr "/_Redenumire director"
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/��tergere _director"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "/_Fi��ier/_Cur��釘are gunoi"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/Verificare _mesaje noi"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/R_escanare directoare"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 #, fuzzy
 msgid "/_Search messages..."
 msgstr "\tC��utare mesaje nestocate... "
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nu exist�� mesaje necitite"
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 #, fuzzy
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/��n_scriere la newsgroup"
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/��te_rgere newsgroup"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Creare mod vedere director...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Nou"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Necitit"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Setare informa釘ii despre director...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Setare informa釘ii despre director..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare director %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare director %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/R_escanare directoare"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Scanare directoare..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Scanare directoare..."
 
-#: src/folderview.c:732
-#, fuzzy
-msgid "Rebuilding all folder trees..."
-msgstr "Rescanare directoare..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "/Verificare _mesaje noi"
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Directorul %s este selectat\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Trimitere mesaj"
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "A avut loc o eroare la 樽ncercarea de a posta mesajul pe %s ."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1856,16 +1862,16 @@ msgstr ""
 "(dac�� dori釘i crearea de subdirectoare in acest director,\n"
 " ad��uga釘i un `/' la sf但r��itul numelui)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Introduce釘i noul nume pentru '%s':"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Redenumire director"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1874,25 +1880,25 @@ msgstr ""
 "Toate directoarele ��i mesajele din '%s' vor fi ��terse.\n"
 "Dori釘i 樽ntr-adev��r s�� continua釘i ?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "��tergere director"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, fuzzy, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr ""
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 #, fuzzy
 msgid "Empty all messages in trash?"
 msgstr "Dori釘i ��tergerea tuturor mesajelor din gunoi ?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1901,35 +1907,35 @@ msgstr ""
 "Sunte釘i sigur c�� dori釘i s�� ��terge釘i cutia po��tal�� '%s'\n"
 "(Mesajele NU sunt ��terse de pe disc)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/��tergere _cutie po��tal��"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sunte釘i sigur c�� dori釘i ��tergerea contului IMAP4 '%s' ?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "��tergere cont IMAP4"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sunte釘i sigur c�� dori釘i ��tergerea newsgroupului '%s' ?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "��tergere newsgroup"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sunte釘i sigur c�� dori釘i ��tergerea contului de news '%s' ?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "��tergere cont de news"
 
@@ -1977,7 +1983,7 @@ msgstr "necunoscut"
 msgid "Can't retrieve newsgroup list."
 msgstr "Lista de newsgroup-uri nu a putut fi ob釘inut��."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Gata."
 
@@ -2266,7 +2272,7 @@ msgstr "Importare fi��ier LDIF 樽n agend��"
 msgid "Prev"
 msgstr "��napio"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "��nainte"
 
@@ -2360,7 +2366,7 @@ msgstr "Conectare la serverul POP3: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "��ncercarea de conectare la serverul POP3 a e��uat: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
@@ -2390,7 +2396,7 @@ msgstr "Recep釘ionarea dimensiunii mesajelor (LIST)..."
 msgid "Deleting message %d"
 msgstr "��tergere mesaj"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "��nchidere conexiune"
 
@@ -2434,7 +2440,8 @@ msgstr "Scrierea 樽n fi��ier este imposibil��.\n"
 msgid "Socket error."
 msgstr "eroare de protocol\n"
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2450,19 +2457,19 @@ msgid ""
 "%s"
 msgstr "Set��ri c��su釘�� po��tal��"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autentificare..."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autentificare..."
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr ""
 
@@ -2937,362 +2944,362 @@ msgstr "/_Message/Set de _caractere/Japonez (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Message/Set de _caractere/Japonez (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Mesaj/Set de _caractere/Chinezesc (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Mesaj/Set de _caractere/Corean (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 #, fuzzy
 msgid "/_View/Open in new _window"
 msgstr "/Deschidere 樽n _fereastr�� nou��"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Show all _header"
 msgstr "/_Afi��are antet"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_Mesaj"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mesaj/Recep釘ion_are po��t�� pentru toate conturile"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mesaj/Recep釘ion_are po��t�� pentru toate conturile"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Message/Salvare ��i _continuare"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mesaj/Trimite mesa_jele din lista de a��teptare"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_Mesaj/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_Mesaj/Compunere mesaj _nou"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_Mesaj/_R��spunde"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/_Mesaj/R��spunde _la to釘i"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mesaj/R��spunde _la to釘i"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mesaj/_R��spuns"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mesaj/R��spunde _la to釘i"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/_Mesaj/��_naintare"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mesaj/��naintare ca a_ta��ament"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_Mesaj/M_utare..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 #, fuzzy
 msgid "/_Message/_Copy..."
 msgstr "/_Mesaj/M_utare..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_Mesaj/��ter_gere"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_Mesaj/_Marcare"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mesaj/_Marcare/_Marcare"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mesaj/_Marcare/_Demarcare"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_Mesaj/_Marcare/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 #, fuzzy
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 #, fuzzy
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mesaj/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 #, fuzzy
 msgid "/_Message/Re-_edit"
 msgstr "/_Mesaj/Re_editare"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Utilitare/_Agend��"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Re_zumat/_Filtrare mesaje"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Fi��ier/Act_ualizare directoare"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Fi��ier/Act_ualizare directoare"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Fi��ier/Act_ualizare directoare"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Fi��ier/Act_ualizare directoare"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Fi��ier/Act_ualizare directoare"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Re_zumat/��tergere mesaje _duplicate"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 #, fuzzy
 msgid "/_Tools/E_xecute"
 msgstr "/E_xecutare"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/_Utilitare/Fereastr�� _jurnal"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Configura釘ie"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configura釘ie/Preferin釘e _comune..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 #, fuzzy
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configura釘ie/_Editare conturi..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 #, fuzzy
 msgid "/_Configuration/_Template..."
 msgstr "/_Configura釘ie/_Editare conturi..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configura釘ie/_Editare conturi..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Configura釘ie/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 #, fuzzy
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configura釘ie/_Preferin釘e per cont..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configura釘ie/Creare cont _nou..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configura釘ie/_Editare conturi..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configura釘ie/_Selectare cont curent"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_Ajutor/_Manual"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajutor/_Manual/_Englez��"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajutor/_Manual/_Japonez��"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/A_jutor/_Despre"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajutor/_Manual/_Englez��"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajutor/_Manual/_Englez��"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajutor/_Manual/_Englez��"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajutor/_Manual/_Englez��"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_Ajutor/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Creare fereastr�� principal��...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principal��: alocarea culorii %d a e��uat\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "gata.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Neintitulat"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "nimic"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "/_Fi��ier/_Cur��釘are gunoi"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Dori釘i ��tergerea tuturor mesajelor din gunoi ?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Ad��ugare cutie po��tal��"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3302,16 +3309,16 @@ msgstr ""
 "Dac�� este specificat�� o cutie po��tal�� existent��, aceasta\n"
 "va fi scanat�� automat."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Cutia po��tal�� '%s' exist�� deja."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Cutie po��tal��"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3321,147 +3328,147 @@ msgstr ""
 "Probabil c�� anumite fi��iere exist�� deja, sau nu ave釘i permisiuni de "
 "scriereadecvate."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_R��spunde"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "R��spunde la to釘i"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/R��spunde _la to釘i"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/R��spunde _la to釘i"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/��_naintare"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/��naintare ca a_ta��ament"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Re_editare"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Ia"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Recep釘ionare mesaje noi pentru contul curent"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Ia tot"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "Recep釘ionare mesaje noi pentru toate conturile"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Trimiterea mesajului(lor) din lista de a��teptare"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Creare"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Creare mesaj nou"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "R��spuns"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "R��spunde la mesaj"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "R��spuns to釘i"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "R��spunde la to釘i"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "��naintare"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "��naintare mesaj"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "��tergere mesaj"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Executare"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Execut�� toate procesele marcate"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "Urm��torul mesaj necitit"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Preferin釘e"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 #, fuzzy
 msgid "Common preferences"
 msgstr "Preferin釘e comune"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Cont"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Set��ri cont curent"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Ie��ire"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Dori釘i s�� p��r��si釘i acest program ?"
 
@@ -3586,29 +3593,29 @@ msgstr "S-a atins sf但r��itul listei; continua釘i de la 樽nceput ?"
 msgid "Search finished"
 msgstr "C��utarea a luat sf但r��it"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Creare vedere mesaj...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 #, fuzzy
 msgid "Text"
 msgstr "��nainte"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Ata��amente"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Imprimare"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3617,7 +3624,7 @@ msgstr ""
 "Introduce釘i linia de comand�� pentru imprimare:\n"
 "('%s' va fi 樽nlocuit cu numele fi��ierului)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4066,7 +4073,7 @@ msgstr "Recep釘ionare toate mesajele de pe server"
 msgid "Receive size limit"
 msgstr ""
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr ""
 
@@ -4088,7 +4095,7 @@ msgstr "Deschide primul mesaj necitit la intrarea 樽ntr-un director"
 msgid "Authentication method"
 msgstr "Autentificare..."
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Automat"
 
@@ -4112,7 +4119,7 @@ msgstr "Generare Message-ID"
 msgid "Add user-defined header"
 msgstr "Ad��ugare de c但mpuri definite de utilizator"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Editare..."
 
@@ -4589,505 +4596,510 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Chinezesc Simplificat (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Chinezesc Simplificat (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinezesc Tradi釘ional (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinezesc Tradi釘ional (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinezesc"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Corean"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr ""
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr ""
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr ""
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Taie liniile 樽nainte de trimitere"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Separator de semn��tur��"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 #, fuzzy
 msgid "Insert automatically"
 msgstr "Insereaz�� semn��tura automat"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 #, fuzzy
 msgid "Automatically launch the external editor"
 msgstr "Editare cu editor extern"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Taie liniile mesajului la"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "caractere"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Taie liniile semn��turii"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 #, fuzzy
 msgid "Wrap on input"
 msgstr "T��iere toate liniile lungi"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Taie liniile 樽nainte de trimitere"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 #, fuzzy
 msgid "Automatically select account for replies"
 msgstr "Setare automat�� a adreselor urm��toare"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Citeaz�� mesajul la care se r��spunde"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 #, fuzzy
 msgid "Reply button invokes mailing list reply"
 msgstr "/R��spunde _la to釘i"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 #, fuzzy
 msgid "Reply format"
 msgstr "R��spunde la to釘i"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Semn de citare"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 #, fuzzy
 msgid "Forward format"
 msgstr "��naintare"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Descrierea simbolurilor "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Font"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traducere antet (cu ar fi 'From:', 'Subject:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Afi��are num��r de mesaje necitite l但ng�� numele directorului"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 #, fuzzy
 msgid "letters"
 msgstr "��tergere"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 #, fuzzy
 msgid "Summary View"
 msgstr "/Re_zumat"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Destinatarul pe coloana 'From', daca sunte釘i expeditorul"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr ""
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 #, fuzzy
 msgid "Date format"
 msgstr "Format de citare:"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " Elemente afi��ate... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Colorare mesaje"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Afi��are caractere pe 2 bi釘i cu un alfabet pe 1 bit"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 #, fuzzy
 msgid "Display header pane above message view"
 msgstr "Afi��are antet scurt"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Afi��are antet scurt"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Spa釘iere linii"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "pixel(i)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr ""
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr ""
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr ""
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr ""
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "/Afi��are ca te_xt"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 #, fuzzy
 msgid "Automatically check signatures"
 msgstr "Setare automat�� a adreselor urm��toare"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr ""
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr ""
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 #, fuzzy
 msgid "Expired after"
 msgstr "Mai t但rziu"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 #, fuzzy
 msgid "minute(s) "
 msgstr "minut(e)"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr ""
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr ""
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "un mesaj nu a putut fi recep釘ionat\n"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Deschide primul mesaj necitit la intrarea 樽ntr-un director"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 #, fuzzy
 msgid "Only mark message as read when opened in new window"
 msgstr "/_Mesaj/Desc_hidere 樽n fereastr�� nou��"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr ""
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr ""
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Recep釘ionare"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr ""
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 #, fuzzy
 msgid "Always"
 msgstr "Alias"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 #, fuzzy
 msgid "Never"
 msgstr "Server"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr ""
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr ""
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr ""
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, fuzzy, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Editor extern (%s va fi 樽nlocuit de numele fi��ierului)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr ""
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "La ie��ire"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Confirmare ie��ire"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 #, fuzzy
 msgid "Empty trash on exit"
 msgstr "Cur��釘are gunoi"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 #, fuzzy
 msgid "Ask before emptying"
 msgstr "��ntreab�� 樽nainte de cur��釘are"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 #, fuzzy
 msgid "Warn if there are queued messages"
 msgstr "Trimiterea mesajului(lor) din lista de a��teptare"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr ""
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr ""
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr ""
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr ""
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr ""
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr ""
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr ""
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr ""
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr ""
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr ""
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 #, fuzzy
 msgid "Specifier"
 msgstr "Selectare fi��ier"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 #, fuzzy
 msgid "Description"
 msgstr "Destina釘ie"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr ""
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 #, fuzzy
 msgid "Set message colors"
 msgstr "Trimitere mesaj"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 #, fuzzy
 msgid "Colors"
 msgstr "��nchidere"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr ""
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr ""
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr ""
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr ""
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr ""
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr ""
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr ""
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr ""
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr ""
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Descrierea simbolurilor"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 #, fuzzy
 msgid ""
 "Date\n"
@@ -5111,11 +5123,11 @@ msgstr ""
 "Message-ID\n"
 "Semnul %"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5124,7 +5136,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5132,27 +5144,27 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Selectare font"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr ""
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 #, fuzzy
 msgid "Default"
 msgstr "��tergere"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr ""
 
@@ -5232,214 +5244,209 @@ msgstr "Filtrare"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Sunte釘i sigur c�� dori釘i s�� ��terge釘i aceast�� regul�� ?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Neintitulat"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "��tergere regul��"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "��tergere regul��"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "Antet"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "Antet"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "Mesaj"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "con釘ine"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "nu con釘ine"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "Jos"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Copiere..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "��tergere"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "��tergere director"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "Observa釘ii"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "Trimitere mesaj"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/��naintare ca a_ta��ament"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/Re_editare"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "Executare"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "Director"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "Adres��"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "Antet"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "Antet"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "Antet"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Destinatarul nu a fost specificat."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Antetul nu a fost definit."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Destina釘ia nu a fost definit��."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 #, fuzzy
 msgid "Invalid action exists."
 msgstr "Lun�� invalid��\n"
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Antetul nu a fost definit."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: fi��ierul nu exist��\n"
@@ -5716,63 +5723,63 @@ msgstr "Conectare la %s ..."
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Conectare la serverul SMTP: %s ...\n"
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Trimitere"
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 #, fuzzy
 msgid "Authenticating"
 msgstr "Autentificare..."
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 #, fuzzy
 msgid "Sending message..."
 msgstr "Trimitere mesaj"
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Trimitere"
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr ""
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 #, fuzzy
 msgid "Sending"
 msgstr "Trimitere"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr ""
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr ""
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 #, fuzzy
 msgid "Quitting..."
 msgstr "��nchidere conexiune"
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, fuzzy, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Recep釘ionare mesaj (%d / %d) (%s / %s octe釘i)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 #, fuzzy
 msgid "Sending message"
 msgstr "Trimitere mesaj"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "A avut loc o eroare la 樽ncercarea de a trimite mesajul."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6097,149 +6104,149 @@ msgstr "Nu."
 msgid "Creating summary view...\n"
 msgstr "Creare rezumat...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Procesare marcaje"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Au mai r��mas ni��te marcaje. Dori釘i s�� fie procesate ?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Scanare director (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 #, fuzzy
 msgid "No more unread messages"
 msgstr "Nu exist�� mesaje necitite"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 #, fuzzy
 msgid "No unread message found. Search from the end?"
 msgstr ""
 "Nu au fost g��site mesaje necitite.\n"
 "Dori釘i avansarea la directorul urm��tor ?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 #, fuzzy
 msgid "No unread messages."
 msgstr "Nu exist�� mesaje necitite"
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nu au fost g��site mesaje necitite.\n"
 "Dori釘i avansarea la directorul urm��tor ?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 #, fuzzy
 msgid "Search again"
 msgstr "C��utarea a e��uat"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 #, fuzzy
 msgid "No more new messages"
 msgstr "Nu exist�� mesaje necitite"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr ""
 "Nu au fost g��site mesaje necitite.\n"
 "Dori釘i avansarea la directorul urm��tor ?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 #, fuzzy
 msgid "No new messages."
 msgstr "Nu exist�� mesaje necitite"
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Nu au fost g��site mesaje necitite.\n"
 "Dori釘i avansarea la directorul urm��tor ?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 #, fuzzy
 msgid "No more marked messages"
 msgstr "Nu exist�� mesaje necitite"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 #, fuzzy
 msgid "No marked message found. Search from the end?"
 msgstr ""
 "Nu au fost g��site mesaje necitite.\n"
 "Dori釘i avansarea la directorul urm��tor ?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 #, fuzzy
 msgid "No marked messages."
 msgstr "Nu exist�� mesaje necitite"
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 #, fuzzy
 msgid "No marked message found. Search from the beginning?"
 msgstr ""
 "Nu au fost g��site mesaje necitite.\n"
 "Dori釘i avansarea la directorul urm��tor ?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 #, fuzzy
 msgid "No more labeled messages"
 msgstr "Nu exist�� mesaje necitite"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 #, fuzzy
 msgid "No labeled message found. Search from the end?"
 msgstr ""
 "Nu au fost g��site mesaje necitite.\n"
 "Dori釘i avansarea la directorul urm��tor ?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 #, fuzzy
 msgid "No labeled messages."
 msgstr "Nu exist�� mesaje necitite"
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr ""
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Atragere mesaje dup�� subiect..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d ��ters(e)"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, fuzzy, c-format
 msgid "%s%d moved"
 msgstr "%d mutat(e)"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, fuzzy, c-format
 msgid "%s%d copied"
 msgstr "%d mutat(e)"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " elemente selectate"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d noi, %d necitite, %d 樽n total (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nou(i), %d necitit(e), %d 樽n total"
@@ -6414,6 +6421,10 @@ msgid "writing to %s failed.\n"
 msgstr "scrierea 樽n %s a e��uat.\n"
 
 #, fuzzy
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Rescanare directoare..."
+
+#, fuzzy
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_Mesaj/Set de _caractere/---"
 
diff --git a/po/ru.po b/po/ru.po
index b663eb2b..02f72ed1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: 2004-12-05 17:16+0300\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -65,11 +65,11 @@ msgstr ""
 "仍亳��亠仆亰亳亳 GNU; 亠��仍亳 ����仂亞仂 仆亠 ��仍����亳仍仂����, -- 仆舒仗亳��亳��亠 于 Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "丼��亠仆亳亠 仆舒������仂亠从 ����亠��仆���� 亰舒仗亳��亠亶...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -77,19 +77,19 @@ msgstr ""
 "��亠从仂��仂����亠 仂从仆舒 �� 仆亠仂��仗��舒于仍亠仆仆��仄亳 ��仂仂弍��亠仆亳�礆亳 仂��从��������.\n"
 "��仂亢舒仍��亶����舒, 亰舒从��仂亶��亠 亳�� 仗亠��亠亟 亳亰仄亠仆亠仆亳亠仄 ����亠��仆���� 亰舒仗亳��亠亶."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "����从������亳亠 仂从仆舒 ��亠亟舒从��亳��仂于舒仆亳�� ����亠��仆���� 亰舒仗亳��亠亶...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "弌仂亰亟舒仆亳亠 仂从仆舒 ��亠亟舒从��亳��仂于舒仆亳�� ����亠��仆���� 亰舒仗亳��亠亶...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "��亠亟舒从��亳��仂于舒仆亳亠 ����亠��仆���� 亰舒仗亳��亠亶"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -98,8 +98,8 @@ msgstr ""
 "��仂仄亠������亠 于 从仂仍仂仆从亠 'G' ����亠��仆��亠 亰舒仗亳��亳, 从仂��仂����亠 仆��亢仆仂 仗��仂于亠��������\n"
 "仗仂 从仂仄舒仆亟亠 '��仂仍����亳���� 于��亠'."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -107,60 +107,66 @@ msgstr ""
 msgid "Name"
 msgstr "��仄��"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "����仂��仂从仂仍"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "弌亠��于亠��"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "��仂弍舒于亳����"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "��亰仄亠仆亳����"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr "丕亟舒仍亳����"
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "��仆亳亰"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "��于亠����"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " 丕����舒仆仂于亳���� ����亠��仆���� 亰舒仗亳���� 仗仂 ��仄仂仍��舒仆亳�� "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "���� 亟亠亶����于亳��亠仍��仆仂 ��仂��亳��亠 ��亟舒仍亳���� ������ 亰舒仗亳����?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "��亠亰 仆舒亰于舒仆亳��"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "丕亟舒仍亳���� ����亠��仆���� 亰舒仗亳����"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "���� 亟亠亶����于亳��亠仍��仆仂 ��仂��亳��亠 ��亟舒仍亳���� ������ 亰舒仗亳����?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "��舒"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+��亠��"
 
@@ -229,7 +235,7 @@ msgstr " ����仗��舒于亳���� "
 msgid "Abort"
 msgstr "����亠��于舒����"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -240,11 +246,11 @@ msgstr ""
 "(仂仆 弍��亟亠�� 仗仂亟����舒于仍亠仆 于仄亠����仂 '%%h'):\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "弌从��������亶 仗舒��舒仄亠���� 亟亠亶����于亳��"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -255,7 +261,7 @@ msgstr ""
 "(仂仆 弍��亟亠�� 仗仂亟����舒于仍亠仆 于仄亠����仂 '%%u'):\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "��仂仍��亰仂于舒��亠仍����从亳亶 仗舒��舒仄亠���� 亟亠亶����于亳��"
 
@@ -263,7 +269,7 @@ msgstr "��仂仍��亰仂于舒��亠仍����从亳亶 仗舒��舒仄亠���� 亟亠亶����于亳��"
 msgid "Add Address to Book"
 msgstr "��仂弍舒于仍亠仆亳亠 舒亟��亠��舒 于 从仆亳亞��"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "��亟��亠��"
@@ -349,8 +355,8 @@ msgstr "/��亟��亠��/����舒于从舒"
 msgid "/_Address/_Delete"
 msgstr "/��亟��亠��/丕亟舒仍亳����"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/��仆��������仄亠仆����"
 
@@ -358,13 +364,13 @@ msgstr "/��仆��������仄亠仆����"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/��仆��������仄亠仆����/��仄仗仂���� ��舒亶仍舒 LDIF"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/弌仗��舒于从舒"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/弌仗��舒于从舒/�� 仗��仂亞��舒仄仄亠"
 
@@ -381,10 +387,10 @@ msgid "/New _Folder"
 msgstr "/��仂于舒�� 仗舒仗从舒"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -403,17 +409,17 @@ msgstr "/丕亟舒仍亳����"
 msgid "E-Mail address"
 msgstr "��亟��亠�� E-Mail"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "��亟��亠��仆舒�� 从仆亳亞舒"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "��仄��:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -582,7 +588,7 @@ msgid "Group"
 msgstr "������仗仗舒"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "��舒仗从舒"
 
@@ -606,7 +612,7 @@ msgstr "��亟��亠��舒 仂��亞舒仆亳亰舒��亳亶"
 msgid "Personal address"
 msgstr "��亳��仆��亠 舒亟��亠��舒"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "丕于亠亟仂仄仍亠仆亳亠"
 
@@ -614,7 +620,7 @@ msgstr "丕于亠亟仂仄仍亠仆亳亠"
 msgid "Warning"
 msgstr "����亠亟��仗��亠亢亟亠仆亳亠"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "����亳弍从舒"
 
@@ -626,31 +632,31 @@ msgstr "弌仂亰亟舒仆亳亠 仂从仆舒 仗��亠亟��仗��亠亢亟亠仆亳��...\n"
 msgid "Show this message next time"
 msgstr "��仂从舒亰��于舒���� ����仂 ��仂仂弍��亠仆亳亠 于 ��仍亠亟���ﾑ�亳亶 ��舒亰"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "����舒仆亢亠于��亶"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "����舒��仆��亶"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "��仂亰仂于��亶"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "��仂仍��弍仂亶"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "弌亳仆亳亶"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "��亠仍亠仆��亶"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "��仂��亳��仆亠于��亶"
 
@@ -658,7 +664,7 @@ msgstr "��仂��亳��仆亠于��亶"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "��亠��"
 
@@ -670,8 +676,8 @@ msgstr "/��仂弍舒于亳����..."
 msgid "/_Remove"
 msgstr "/丕亟舒仍亳����"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/弌于仂亶����于舒..."
 
@@ -831,8 +837,8 @@ msgstr "/��亳亟/��亟��亠�� 亟仍�� 仂��于亠��舒"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/��亳亟/---"
 
@@ -859,7 +865,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -942,137 +948,142 @@ msgstr "/��亳亟/��仂亟亳��仂于从舒/丕仗��仂��亠仆仆舒�� 从亳��舒亶��从舒�� (_GB2
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/丕仗��仂��亠仆仆舒�� 从亳��舒亶��从舒�� (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/丐��舒亟亳��亳仂仆仆舒�� 从亳��舒亶��从舒�� (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/丐��舒亟亳��亳仂仆仆舒�� 从亳��舒亶��从舒�� (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/��仂��亠亶��从舒�� (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/丐舒亶��从舒�� (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/丐舒亶��从舒�� (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/��仆��������仄亠仆����/��亟��亠��仆舒�� 从仆亳亞舒"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/��仆��������仄亠仆����/丿舒弍仍仂仆"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/��仆��������仄亠仆����/��亠亶����于亳��"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/��仆��������仄亠仆����/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/��仆��������仄亠仆����/����亰于舒���� 于仆亠��仆亳亶 ��亠亟舒从��仂��"
 
-#: src/compose.c:674
+#: src/compose.c:676
 msgid "/_Tools/PGP Si_gn"
 msgstr "/��仆��������仄亠仆����/��仂亟仗亳��舒���� ��仂仂弍��亠仆亳亠 (PGP)"
 
-#: src/compose.c:675
+#: src/compose.c:677
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/��仆��������仄亠仆����/丿亳����仂于舒���� ��仂仂弍��亠仆亳亠 (PGP)"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ��舒亶仍 仆亠 ������亠����于��亠��\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "����亳弍从舒 仗仂仍����亠仆亳�� ��舒����亳 ��亠从����舒\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "��亠于亠��仆��亶 ��仂��仄舒�� 仄亠��从亳 ��亳��亳��仂于舒仆亳��."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "��亠于亠��仆��亶 ��仂��仄舒�� ��舒弍仍仂仆舒 仂��于亠��舒 亳仍亳 仗亠��亠����仍从亳."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "个舒亶仍 %s 仆亠 仆舒亶亟亠仆\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "����亳弍从舒 仂仗��亠亟亠仍亠仆亳�� ��舒亰仄亠��舒 ��舒亶仍舒 %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "个舒亶仍 %s 仗������仂亶."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "��亠于仂亰仄仂亢仆仂 仗��仂��亳��舒���� %s."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "弌仂仂弍��亠仆亳亠: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "����亳弍从舒 仗��亳 仗仂仍����亠仆亳亳 仂亟仆仂亞仂 亳亰 从仂仄仗仂仆亠仆��仂于 ��仂仂弍��亠仆亳��."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [��亰仄亠仆亠仆仂]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - ��仂亟亞仂��仂于从舒 ��仂仂弍��亠仆亳��%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "��仂亟亞仂��仂于从舒 ��仂仂弍��亠仆亳��%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "��仂仍����舒��亠仍�� ��仂仂弍��亠仆亳�� 仆亠 ��从舒亰舒仆."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "����仗��舒于亳����"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "丐亠仄舒 ��仂仂弍��亠仆亳�� 仆亠 ��从舒亰舒仆舒. ����仗��舒于亳���� 弍亠亰 ��亠仄��?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "仂��亳弍从舒 仂仗��亠亟亠仍亠仆亳�� ��仗亳��从舒 仗仂仍����舒��亠仍亠亶."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1080,26 +1091,26 @@ msgstr ""
 "丕��亠��仆舒�� 亰舒仗亳���� 亟仍�� 仂��仗��舒于从亳 仗仂������ 仆亠 仂仗��亠亟亠仍亠仆舒.\n"
 "��仂亢舒仍��亶����舒, 于��弍亠��亳��亠 亠亠 仗亠��亠亟 仂��仗��舒于从仂亶."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "����仂亳亰仂��仍舒 仂��亳弍从舒 仗��亳 仂��仗��舒于从亠 ��仂仂弍��亠仆亳�� 仆舒 %s ."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "����亳弍从舒 ��仂����舒仆亠仆亳�� ��仂仂弍��亠仆亳�� 于 仗舒仗从亠 仂��仗��舒于仍亠仆仆����."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "��亠 仆舒亶亟亠仆 从仍�ﾑ�, ��仂仂��于亠������于���ﾑ�亳亶 于��弍��舒仆仆仂仄�� 亳亟亠仆��亳��亳从舒��仂���� '%s'."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "仆亠 ��亟舒仍仂���� 亳亰仄亠仆亳���� ��于仂亶����于舒 ��舒亶仍舒\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1109,140 +1120,140 @@ msgstr ""
 "亳亰 %s 于 %s.\n"
 "����亠 ��舒于仆仂 仗仂��仍舒���� 亠亞仂?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "仂��亳弍从舒 亰舒仗亳��亳 亰舒亞仂仍仂于从仂于\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "仂��亳弍从舒 ��亟舒仍亠仆亳�� ����舒��仂亞仂 ��仂仂弍��亠仆亳��\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "仗仂����舒仆仂于从舒 ��仂仂弍��亠仆亳�� 于 仂��亠��亠亟��...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "仆亠于仂亰仄仂亢仆仂 仆舒亶��亳 仗舒仗从�� 仂��亠��亠亟亳\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "仂��亳弍从舒 ��舒亰仄亠��亠仆亳�� 于 仂��亠��亠亟亳\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "��仂亰亟舒仆 Message-ID: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "弌仂亰亟舒仆亳亠 仂从仆舒 仗仂亟亞仂��仂于从亳 ��仂仂弍��亠仆亳��...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "丐亳仗 MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "��舒亰仄亠��"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "����:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "����仗��舒于亳���� ��仂仂弍��亠仆亳亠"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "����仗��舒于亳���� 仗仂亰亢亠"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "��仂仄亠����亳���� 于 仂��亠��亠亟�� 亳 仂��仗��舒于亳���� 仗仂亰亢亠"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "丼亠��仆仂于亳从亳"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "弌仂����舒仆亳���� 于 仗舒仗从亠 ��亠��仆仂于亳从仂于"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "������舒于亳����"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "������舒于亳���� ��舒亶仍"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "��仍仂亢亠仆亳亠"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "��仍仂亢亳���� ��舒亶仍"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "��仂亟仗亳����"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "��仂弍舒于亳���� 仗仂亟仗亳����"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "��亠亟舒从��仂��"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "����舒于亳���� 于仆亠��仆亳仄 ��亠亟舒从��仂��仂仄"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "��亠��亠仆仂�� ������仂从"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "������仂��仄舒��亳��仂于舒���� 于��亠 ��仂仂弍��亠仆亳亠"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "��亠于亠��仆��亶 ��亳仗 MIME."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "个舒亶仍 仆亠 ������亠����于��亠�� 亳仍亳 仗������."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "弌于仂亶����于舒"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "��仂亟亳��仂于从舒"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "��������"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "��仄�� ��舒亶仍舒"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "��亠于亠��仆舒�� 从仂仄舒仆亟舒 于��亰仂于舒 于仆亠��仆亠亞仂 ��亠亟舒从��仂��舒: '%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1253,72 +1264,72 @@ msgstr ""
 "��舒于亠����亳���� 仗��仂��亠���� 仗��亳仆��亟亳��亠仍��仆仂?\n"
 "��亟亠仆��亳��亳从舒��仂�� 亞����仗仗�� 仗��仂��亠����仂于: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "��舒于亠����亠仆 仗��仂��亠���� 亞����仗仗��: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "����亠仄亠仆仆��亶 ��舒亶仍: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "��仂亟亞仂��仂于从舒 ��仂仂弍��亠仆亳��: 于于仂亟 亳亰 仗��仂��亠����舒 ��仍亠亢亠仆亳��\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "��亠 ��亟舒仍仂���� 亰舒仗������亳���� 于仆亠��仆亳亶 ��亠亟舒从��仂��\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "����亳弍从舒 亰舒仗亳��亳 于 ��舒亶仍\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "����亳弍从舒 ����亠仆亳�� 亳亰 从舒仆舒仍舒\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "����亳弍从舒 仗仂����舒仆仂于从亳 于 仂��亠��亠亟��."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "����弍仂�� ��舒亶仍舒"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "����弍仂�� ��舒亶仍舒"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "����从舒亰 仂�� ��仂仂弍��亠仆亳��"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "亅��仂 ��仂仂弍��亠仆亳亠 亳亰仄亠仆亠仆仂. ����从舒亰舒�������� 仂�� 仆亠亞仂?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "����从舒亰舒��������"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "�� ��亠��仆仂于亳从亳"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "����亳仄亠仆亳���� ��舒弍仍仂仆 '%s'?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "����亳仄亠仆亳���� ��舒弍仍仂仆"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "��舒仄亠仆亳����"
 
@@ -1479,12 +1490,12 @@ msgstr "��亰仄亠仆亳���� 亳仄�� 仗舒仗从亳"
 msgid "Input the new name of folder:"
 msgstr "��于亠亟亳��亠 仆仂于仂亠 亳仄�� 仗舒仗从亳:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "��仂于舒�� 仗舒仗从舒"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "��于亠亟亳��亠 亳仄�� 仆仂于仂亶 仗舒仗从亳:"
 
@@ -1654,160 +1665,156 @@ msgstr "仂��亳弍从舒 亰舒仗亳��亳 仆舒������仂亠从 于 ��舒亶仍\n"
 msgid "Select folder"
 msgstr "����弍仂�� 仗舒仗从亳"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "����仂亟����亳亠"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "����仗��舒于仍亠仆仆��亠"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "����亠��亠亟��"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "��仂��亰亳仆舒"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "丼亠��仆仂于亳从亳"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "��仂于舒����舒仗从舒"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "弌亳仄于仂仍 '%c' 仆亠 仄仂亢亠�� 于��仂亟亳���� 于 亳仄�� 仗舒仗从亳."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "��舒仗从舒 '%s' ��亢亠 ������亠����于��亠��."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "��亠 ��亟舒仍仂���� ��仂亰亟舒���� 仗舒仗从�� '%s'."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/弌仂亰亟舒���� 仆仂于���� 仗舒仗从��..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/��亠��亠亳仄亠仆仂于舒���� 仗舒仗从��..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/丕亟舒仍亳���� 仗舒仗从��"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 msgid "/Empty _trash"
 msgstr "/����亳����亳���� 从仂��亰亳仆��"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/����仂于亠��亳���� 仆仂于��亠 ��仂仂弍��亠仆亳��"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/��亠��亠������仂亳���� 亟亠��亠于仂 仗舒仗仂从"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/��仂亳��从 ��仂仂弍��亠仆亳亶..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 msgid "/Down_load"
 msgstr "/��舒亞����亰亳����"
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/��仂亟仗亳��从舒 仆舒 亞����仗仗�� 仆仂于仂����亠亶..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/丕亟舒仍亳���� 亞����仗仗�� 仆仂于仂����亠亶"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "弌仂亰亟舒仆亳亠 仂弍仍舒����亳 仗��仂��仄仂����舒 仗舒仗仂从...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "��仂于��亠"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "��亠仗��仂��亳��舒仆仆��亠"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "丕����舒仆仂于从舒 亳仆��仂��仄舒��亳亳 仂 仗舒仗从亠...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "丕����舒仆仂于从舒 亳仆��仂��仄舒��亳亳 仂 仗舒仗从亠..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "����仂��仄仂���� 仗舒仗从亳 %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "����仂��仄仂���� 仗舒仗从亳 %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "��亠��亠������仂亳���� 亟亠��亠于仂 仗舒仗仂从"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "��亠��亠于仂 仗舒仗仂从 弍��亟亠�� 仗亠��亠������仂亠仆仂. ����仂亟仂仍亢亳����?"
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "��亠��亠������仂亶从舒 亟亠��亠于舒 仗舒仗仂从..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 msgid "Rebuilding of the folder tree failed."
 msgstr "����亳弍从舒 仗��亳 仗亠��亠������仂亶从亠 亟亠��亠于舒 仗舒仗仂从."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "��亠��亠������仂亶从舒 于��亠�� 亟亠��亠于��亠于 仗舒仗仂从 ..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "����仂于亠��从舒 仆仂于���� ��仂仂弍��亠仆亳亶 于仂 于��亠�� 仗舒仗从舒��..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "��舒仗从舒 %s 于��弍��舒仆舒\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "��舒亞����亢舒�ﾑ����� ��仂仂弍��亠仆亳�� 亳亰 %s ..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "����仂亳亰仂��仍舒 仂��亳弍从舒 仗��亳 亰舒亞����亰从亠 ��仂仂弍��亠仆亳亶 亳亰 '%s'."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1817,16 +1824,16 @@ msgstr ""
 "(亠��仍亳 于�� ��仂��亳��亠 ��仂亰亟舒���� 仗舒仗从�� 亟仍�� 于仍仂亢亠仆仆���� 仗舒仗仂从,\n"
 " 亟仂弍舒于����亠 '/' 于 从仂仆亠�� 亳仄亠仆亳)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "��于亠亟亳��亠 仆仂于仂亠 亳仄�� 亟仍�� '%s':"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "��亠��亠亳仄亠仆仂于舒���� 仗舒仗从��"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1835,24 +1842,24 @@ msgstr ""
 "����亠 于仍仂亢亠仆仆��亠 仗舒仗从亳 亳 ��仂仂弍��亠仆亳�� 亳亰 '%s' 弍��亟���� ��亟舒仍亠仆��.\n"
 "���� 亟亠亶����于亳��亠仍��仆仂 ��仂��亳��亠 ��亟舒仍亳���� 仗舒仗从��?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "丕亟舒仍亳���� 仗舒仗从��"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "����亳弍从舒 仗��亳 ��亟舒仍亠仆亳亳 仗舒仗从亳 '%s'."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "����亳����从舒 从仂��亰亳仆��"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "丕亟舒仍亳���� 于��亠 ��仂仂弍��亠仆亳�� 亳亰 从仂��亰亳仆��?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1861,34 +1868,34 @@ msgstr ""
 "丕亟舒仍亳���� 仗仂����仂于��亶 ����亳从 '%s' ?\n"
 "(弌仂仂弍��亠仆亳�� 仆亠 弍��亟���� ��亟舒仍亠仆�� �� 亟亳��从舒)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "丕亟舒仍亳���� 仗仂����仂于��亶 ����亳从"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "丕亟舒仍亳���� ����亠��仆���� 亰舒仗亳���� IMAP4 '%s'?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "丕亟舒仍亳���� ����亠��仆���� 亰舒仗亳���� IMAP4"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "丕亟舒仍亳���� 亞����仗仗�� 仆仂于仂����亠亶 '%s'?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "丕亟舒仍亠仆亳亠 亞����仗仗�� 仆仂于仂����亠亶"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "丕亟舒仍亳���� ����亠��仆���� 亰舒仗亳���� 仆仂于仂����亠亶 '%s'?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "丕亟舒仍亳���� ����亠��仆���� 亰舒仗亳���� 仆仂于仂����亠亶"
 
@@ -1936,7 +1943,7 @@ msgstr "仆亠亳亰于亠����仆��亶"
 msgid "Can't retrieve newsgroup list."
 msgstr "��亠 ��亟舒仍仂���� 仗仂仍����亳���� ��仗亳��仂从 亞����仗仗 仆仂于仂����亠亶."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "����仗仂仍仆亠仆仂."
 
@@ -2219,7 +2226,7 @@ msgstr "��仄仗仂���� ��舒亶仍舒 LDIF 于 舒亟��亠��仆���� 从仆亳亞��"
 msgid "Prev"
 msgstr "��舒亰舒亟"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "��舒仍亠亠"
 
@@ -2309,7 +2316,7 @@ msgstr "弌仂亠亟亳仆亠仆亳亠 �� ��亠��于亠��仂仄 POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "��亠 ��亟舒仍仂���� ��仂亠亟亳仆亠仆亳亠 �� ��亠��于亠��仂仄 POP3: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "������亠仆��亳��亳从舒��亳��..."
 
@@ -2339,7 +2346,7 @@ msgstr "��仂仍����亠仆亳亠 ��舒亰仄亠��舒 ��仂仂弍��亠仆亳亶 (LIST)..."
 msgid "Deleting message %d"
 msgstr "丕亟舒仍亠仆亳亠 ��仂仂弍��亠仆亳�� %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "������仂亟"
 
@@ -2382,7 +2389,8 @@ msgstr "����亳弍从舒 亰舒仗亳��亳 于 ��舒亶仍."
 msgid "Socket error."
 msgstr "����亳弍从舒 ��仂从亠��舒."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "弌亠��于亠�� 亰舒从����仍 ��仂亠亟亳仆亠仆亳亠."
 
@@ -2399,11 +2407,11 @@ msgstr ""
 "��仂����仂于��亶 ����亳从 亰舒仆����:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "����亳弍从舒 舒����亠仆��亳��亳从舒��亳亳."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2412,7 +2420,7 @@ msgstr ""
 "����亳弍从舒 舒����亠仆��亳��亳从舒��亳亳:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr "����亠仄�� ��亠舒仆��舒 亳����亠从仍仂."
 
@@ -2826,320 +2834,320 @@ msgstr "/��亳亟/��仂亟亳��仂于从舒/亊仗仂仆��从舒�� (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/亊仗仂仆��从舒�� (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/��亳��舒亶��从舒�� (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/��仂��亠亶��从舒�� (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/��亳亟/����从�������� 于 仆仂于仂仄 仂从仆亠"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/��亳亟/��仂从舒亰舒���� 亳����仂亟仆��亶 ��亠从����"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/��亳亟/��仂从舒亰舒���� 于��亠 亰舒亞仂仍仂于从亳"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/��亳亟/��弍仆仂于亳���� ��仗亳��仂从 ��仂仂弍��亠仆亳亶"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/弌仂仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 msgid "/_Message/Recei_ve"
 msgstr "/弌仂仂弍��亠仆亳亠/��仂仍����亳����"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/弌仂仂弍��亠仆亳亠/��仂仍����亳����/��仂仍����亳���� �� ��亠从����亠亶 ����亠��仆仂亶 亰舒仗亳��亳"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/弌仂仂弍��亠仆亳亠/��仂仍����亳����/��仂仍����亳���� ��仂 于��亠�� ����亠��仆���� 亰舒仗亳��亠亶"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/弌仂仂弍��亠仆亳亠/��仂仍����亳����/����亠��于舒���� 仗仂仍����亠仆亳亠 ��仂仂弍��亠仆亳亶"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 msgid "/_Message/Recei_ve/---"
 msgstr "/弌仂仂弍��亠仆亳亠/��仂仍����亳����/---"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/弌仂仂弍��亠仆亳亠/����仗��舒于亳���� ��仂仂弍��亠仆亳�� 亳亰 仂��亠��亠亟亳"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/弌仂仂弍��亠仆亳亠/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/弌仂仂弍��亠仆亳亠/��舒仗亳��舒���� 仆仂于仂亠 ��仂仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/弌仂仂弍��亠仆亳亠/����于亠��亳����"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/弌仂仂弍��亠仆亳亠/����于亠��亳����..."
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/弌仂仂弍��亠仆亳亠/����于亠��亳����.../����亠仄"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/弌仂仂弍��亠仆亳亠/����于亠��亳����.../����仗��舒于亳��亠仍��"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/弌仂仂弍��亠仆亳亠/����于亠��亳����.../�� ��仗亳��仂从 ��舒������仍从亳"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/弌仂仂弍��亠仆亳亠/��亠��亠��仍舒����"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/弌仂仂弍��亠仆亳亠/��亠��亠��仍舒���� 从舒从 于仍仂亢亠仆亳亠"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/弌仂仂弍��亠仆亳亠/��亠��亠仆舒仗��舒于亳���� 弍亠亰 亳亰仄亠仆亠仆亳亶"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/弌仂仂弍��亠仆亳亠/��亠��亠仄亠����亳����..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/弌仂仂弍��亠仆亳亠/��仂仗亳��仂于舒����..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/弌仂仂弍��亠仆亳亠/丕亟舒仍亳����"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/弌仂仂弍��亠仆亳亠/����仄亠��亳����"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/弌仂仂弍��亠仆亳亠/����仄亠��亳����/����仄亠��亳����"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/弌仂仂弍��亠仆亳亠/����仄亠��亳����/弌仆������ 仂��仄亠��从��"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/弌仂仂弍��亠仆亳亠/����仄亠��亳����/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/弌仂仂弍��亠仆亳亠/����仄亠��亳����/��仂仄亠��亳���� 从舒从 仆亠仗��仂��亳��舒仆仆仂亠"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/弌仂仂弍��亠仆亳亠/����仄亠��亳����/��仂仄亠��亳���� 从舒从 仗��仂��亳��舒仆仆仂亠"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/弌仂仂弍��亠仆亳亠/����仄亠��亳����/��仂仄亠��亳���� 于��亠 ��仂仂弍��亠仆亳�� 从舒从 仗��仂��亳��舒仆仆��亠"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/弌仂仂弍��亠仆亳亠/��亰仄亠仆亳����"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/��仆��������仄亠仆����/��仂弍舒于亳���� 仂��仗��舒于亳��亠仍�� 于 舒亟��亠��仆���� 从仆亳亞��"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/��仆��������仄亠仆����/������亳仍������仂于舒���� 于��亠 ��仂仂弍��亠仆亳�� 于 仗舒仗从亠"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 msgid "/_Tools/Filter _selected messages"
 msgstr "/��仆��������仄亠仆����/������亳仍������仂于舒���� 于��弍��舒仆仆��亠 ��仂仂弍��亠仆亳��"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/��仆��������仄亠仆����/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/��仆��������仄亠仆����/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳/��于��仂仄舒��亳��亠��从亳"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/��仆��������仄亠仆����/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳/��仂 仂��仗��舒于亳��亠仍��"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/��仆��������仄亠仆����/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳/��仂 仗仂仍����舒��亠仍��"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/��仆��������仄亠仆����/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳/��仂 ��亠仄亠"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/��仆��������仄亠仆����/丕亟舒仍亳���� 仗仂于��仂�����ﾑ�亳亠���� ��仂仂弍��亠仆亳��"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/��仆��������仄亠仆����/����仗仂仍仆亳����"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/��仆��������仄亠仆����/��从仆仂 亢����仆舒仍舒"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/��舒������仂亶从舒"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/��舒������仂亶从舒/��弍��亳亠 仆舒������仂亶从亳..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/��舒������仂亶从舒/��舒������仂亶从舒 ��亳仍������仂于..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/��舒������仂亶从舒/丿舒弍仍仂仆��..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/��舒������仂亶从舒/��亠亶����于亳��..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/��舒������仂亶从舒/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/��舒������仂亶从舒/��舒������仂亶从舒 ��亠从����亠亶 ����亠��仆仂亶 亰舒仗亳��亳... "
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/��舒������仂亶从舒/弌仂亰亟舒���� 仆仂于���� ����亠��仆���� 亰舒仗亳����..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/��舒������仂亶从舒/��亠亟舒从��亳��仂于舒仆亳亠 ����亠��仆���� 亰舒仗亳��亠亶..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/��舒������仂亶从舒/��亠��亠从仍�ﾑ�亳���� ��亠从�������� ����亠��仆���� 亰舒仗亳����"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/弌仗��舒于从舒/����从仂于仂亟����于仂"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/弌仗��舒于从舒/����从仂于仂亟����于仂/��仆亞仍亳亶��从仂亠"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/弌仗��舒于从舒/����从仂于仂亟����于仂/亊仗仂仆��从仂亠"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/弌仗��舒于从舒/FAQ"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/弌仗��舒于从舒/FAQ/��仆亞仍亳亶��从亳亶"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/弌仗��舒于从舒/FAQ/��亠仄亠��从亳亶"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/弌仗��舒于从舒/FAQ/����仗舒仆��从亳亶"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/弌仗��舒于从舒/FAQ/个��舒仆����亰��从亳亶"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/弌仗��舒于从舒/FAQ/����舒仍���礌��从亳亶"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/弌仗��舒于从舒/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "弌仂亰亟舒仆亳亠 亞仍舒于仆仂亞仂 仂从仆舒...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "��仍舒于仆仂亠 仂从仆仂: 仗��仂弍仍亠仄舒 �� ��于亠��仂仄 %d\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "于��仗仂仍仆亠仆仂.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "��亠亰 仆舒亰于舒仆亳��"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "仆亠��"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "��亰仄亠仆亠仆亳亠 ��亳仗舒 ��舒亰亟亠仍亠仆亳�� 仂从仆舒 �� %d 仆舒 %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr "��于��仂仆仂仄仆舒�� ��舒弍仂��舒"
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr "���� ��舒弍仂��舒亠��亠 于 舒于��仂仆仂仄仆仂仄 ��亠亢亳仄亠. ��仂亟从仍�ﾑ�亳�������� 从 ��亠��亳?"
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 msgid "Empty all trash"
 msgstr "����亳����亳���� 于��亠 从仂��亰亳仆��"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 msgid "Empty messages in all trash?"
 msgstr "丕亟舒仍亳���� 于��亠 ��仂仂弍��亠仆亳�� 亳亰 于��亠�� 从仂��亰亳仆?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "��仂弍舒于亳���� 仗仂����仂于��亶 ����亳从"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3149,16 +3157,16 @@ msgstr ""
 "����仍亳 弍��亟亠�� ��从舒亰舒仆 ������亠����于���ﾑ�亳亶 ����亳从, ��仂 仂仆\n"
 "弍��亟亠�� 舒于��仂仄舒��亳��亠��从亳 仗��仂��亳��舒仆."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "��仂����仂于��亶 ����亳从 '%s' ��亢亠 ������亠����于��亠��."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "��仂����仂于��亶 ����亳从"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3168,142 +3176,142 @@ msgstr ""
 "��仂亢亠�� 弍������, 仆亠从仂��仂����亠 ��舒亶仍�� ��亢亠 ������亠����于���ﾑ�, 亳仍亳 于�� 仆亠 亳仄亠亠��亠 仗��舒于 仆舒 亰舒仗亳���� "
 "于 从舒��舒仍仂亞亠."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - ��舒仗从亳"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 弌仂仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/����于亠��亳����"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 msgid "/Reply to _all"
 msgstr "/����于亠��亳���� 于��亠仄"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 msgid "/Reply to _sender"
 msgstr "/����于亠��亳���� 仂��仗��舒于亳��亠仍��"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 msgid "/Reply to mailing _list"
 msgstr "/����于亠��亳���� 于 ��仗亳��仂从 ��舒������仍从亳"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/��亠��亠��仍舒����"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/��亠��亠��仍舒���� 从舒从 于仍仂亢亠仆亳亠"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/��亠��亠仆舒仗��舒于亳���� 弍亠亰 亳亰仄亠仆亠仆亳亶"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "����亳仆������"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "��仂仍����亳���� 仆仂于��亠 ��仂仂弍��亠仆亳��"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "����亳仆������ 于��亠"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "��仂仍����亳���� ��仂仂弍��亠仆亳�� ��仂 于��亠�� ����亠��仆���� 亰舒仗亳��亠亶"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "��仂��仍舒���� ��仂仂弍��亠仆亳�� 亳亰 仂��亠��亠亟亳"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "��舒仗亳��舒����"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "��舒仗亳��舒���� 仆仂于仂亠 ��仂仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "����于亠��亳����"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "����于亠��亳���� 仆舒 ��仂仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "����于亠��亳���� 于��亠仄"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "����于亠��亳���� 于��亠仄"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "��亠��亠��仍舒����"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "��亠��亠��仍舒���� ��仂仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "丕亟舒仍亳���� ��仂仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "����仗仂仍仆亳����"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "����仗仂仍仆亳���� 仂��仄亠��亠仆仆��亶 仗��仂��亠����"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "弌仍亠亟���ﾑ�亠亠 仆亠仗��仂��亳��舒仆仆仂亠 ��仂仂弍��亠仆亳亠"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "弌于仂亶����于舒"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "��弍��亳亠 仆舒������仂亶从亳"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "丕��亠��仆舒�� 亰舒仗亳����"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "��舒������仂亶从舒 ����亠��仆仂亶 亰舒仗亳��亳"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "���� ��舒弍仂��舒亠��亠 于 舒于��仂仆仂仄仆仂仄 ��亠亢亳仄亠. 乂亠仍从仆亳��亠 仗仂 亰仆舒��从��, ����仂弍�� 仗仂亟从仍�ﾑ�亳��������."
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr "���� 仗仂亟从仍�ﾑ�亠仆��. 乂亠仍从仆亳��亠 仗仂 亰仆舒��从��, ����仂弍�� ��舒弍仂��舒���� 舒于��仂仆仂仄仆仂."
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "������仂亟"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "����亶��亳 亳亰 仗��仂亞��舒仄仄��?"
 
@@ -3426,28 +3434,28 @@ msgstr "��仂����亳亞仆���� 从仂仆亠�� ��仂仂弍��亠仆亳��; 仗��仂亟仂仍亢亳���� �
 msgid "Search finished"
 msgstr "��仂亳��从 亰舒从仂仆��亠仆"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "弌仂亰亟舒仆亳亠 仂弍仍舒����亳 仗��仂��仄仂����舒 ��仂仂弍��亠仆亳��...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "丐亠从����"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "��仍仂亢亠仆亳��"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "����亳弍从舒 仗��亳 ��仂����舒仆亠仆亳亳 ��舒亶仍舒 '%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "��亠��舒����"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3456,7 +3464,7 @@ msgstr ""
 "��于亠亟亳��亠 从仂仄舒仆亟�� 仗亠��舒��亳:\n"
 "('%s' 弍��亟亠�� 亰舒仄亠仆亠仆仂 仆舒 亳仄�� ��舒亶仍舒)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3896,7 +3904,7 @@ msgstr "����亳仆亳仄舒���� 于��亠 ��仂仂弍��亠仆亳�� �� ��亠��于亠��舒"
 msgid "Receive size limit"
 msgstr "��亞��舒仆亳��亳���� ��舒亰仄亠�� 仗��亳仆亳仄舒亠仄���� ��仂仂弍��亠仆亳亶"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "从弍"
 
@@ -3916,7 +3924,7 @@ msgstr "(��亠仂����亳仍������仂于舒仆仆��亠 ��仂仂弍��亠仆亳�� 弍��亟���� ��仂��
 msgid "Authentication method"
 msgstr "��亠��仂亟 舒����亠仆��亳��亳从舒��亳亳"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "��于��仂仄舒��亳��亠��从亳"
 
@@ -3940,7 +3948,7 @@ msgstr "弌仂亰亟舒于舒���� Message-ID"
 msgid "Add user-defined header"
 msgstr "��仂弍舒于亳���� 亟仂仗仂仍仆亳��亠仍��仆��亠 亰舒亞仂仍仂于从亳"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " ��仗��亠亟亠仍亳����... "
 
@@ -4412,30 +4420,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "丕仗��仂��亠仆仆舒�� 从亳��舒亶��从舒�� (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "丕仗��仂��亠仆仆舒�� 从亳��舒亶��从舒�� (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "丐��舒亟亳��亳仂仆仆舒�� 从亳��舒亶��从舒�� (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "丐��舒亟亳��亳仂仆仆舒�� 从亳��舒亶��从舒�� (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "��亳��舒亶��从舒�� (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "��仂��亠亶��从舒�� (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "丐舒亶��从舒�� (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "丐舒亶��从舒�� (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4444,11 +4457,11 @@ msgstr ""
 "����亳 于��弍仂��亠 于舒��亳舒仆��舒 '��于��仂仄舒��亳��亠��从亳' 弍��亟亠�� 亳��仗仂仍��亰仂于舒仆舒\n"
 "仂仗��亳仄舒仍��仆舒�� 从仂亟亳��仂于从舒 亟仍�� ��亠从����亠亞仂 �磶��从舒 亳 ������舒仆��."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "��仂亟亳��仂于舒仆亳亠 ��亠从����舒 ��仂仂弍��亠仆亳亶"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4457,118 +4470,118 @@ msgstr ""
 "丕从舒亢亳��亠 仄亠��仂亟 从仂亟亳��仂于舒仆亳�� ��亠从����仂于 ��仂仂弍��亠仆亳亶, ��仂亟亠��亢舒��亳�� ��亳仄于仂仍��\n"
 "仆亠 亳亰 亟亳舒仗舒亰仂仆舒 ASCII (Content-Transfer-Encoding)."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "��舒亰亟亠仍亳��亠仍�� 仗仂亟仗亳��亳"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "��仂弍舒于仍������ 舒于��仂仄舒��亳��亠��从亳"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "��于��仂仄舒��亳��亠��从亳 亰舒仗����从舒���� 于仆亠��仆亳亶 ��亠亟舒从��仂��"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "丼亳��仍仂 ����仂于仆亠亶 仂��从舒��舒"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "��亠��亠仆仂��亳���� ������仂从亳 ��"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "��亳仄于仂仍舒"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "��亠��亠仆仂��亳���� ��亳��舒����"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "��亠��亠仆仂��亳���� 仗��亳 于于仂亟亠"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "��亠��亠仆仂��亳���� 仗亠��亠亟 仂��仗��舒于从仂亶"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "��于��仂仄舒��亳��亠��从亳 于��弍亳��舒���� ����亠��仆���� 亰舒仗亳���� 仗��亳 仂��于亠��亠"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "丶亳��亳��仂于舒���� 仗��亳 仂��于亠��亠"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "��仂 从仆仂仗从亠 \"����于亠��亳����\" 仂��于亠��舒���� 于 ��仗亳��仂从 ��舒������仍从亳"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "个仂��仄舒�� 仂��于亠��舒"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "��仆舒从 ��亳��舒����"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "个仂��仄舒�� 仗亠��亠����仍舒亠仄仂亞仂 ��仂仂弍��亠仆亳��"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " ��仗亳��舒仆亳亠 ��亳仄于仂仍仂于 "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "丿��亳����"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "��亠��亠于仂亟亳���� 亳仄亠仆舒 亰舒亞仂仍仂于从仂于 ('From:', 'Subject:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "��仂从舒亰��于舒���� ��亳��仍仂 仆亠仗��仂��亳��舒仆仆���� ��仂仂弍��亠仆亳亶 ���磲仂仄 �� 亳仄亠仆亠仄 仗舒仗从亳"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "弌仂从��舒��舒���� 仆舒亰于舒仆亳�� 亞����仗仗 仆仂于仂����亠亶 亟仍亳仆仆亠亠"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "弍��从于"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "弌仗亳��仂从 ��仂仂弍��亠仆亳亶"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "��仂从舒亰��于舒���� 仗仂仍����舒��亠仍�� 于 从仂仍仂仆从亠 '����', 亠��仍亳 仂��仗��舒于亳��亠仍�� - ����"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "��舒亰于仂��舒��亳于舒���� 仂弍����亢亟亠仆亳��"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "个仂��仄舒�� 亟舒����"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr "丕����舒仆仂于亳���� 仗仂从舒亰��于舒亠仄��亠 仗仂仍��..."
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "��舒亰��亠��亳���� ��舒��从��舒��从�� ��仂仂弍��亠仆亳亶"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4576,327 +4589,327 @@ msgstr ""
 "����仂弍��舒亢舒���� 仄仆仂亞仂弍舒亶��仂于��亠 舒仍��舒于亳��仆仂-��亳����仂于��亠 ��亳仄于仂仍��\n"
 "从舒从 ASCII (��仂仍��从仂 亟仍�� �礚仂仆��从亳�� 从仂亟亳��仂于仂从)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "��仂从舒亰��于舒���� 仗舒仆亠仍�� 亰舒亞仂仍仂于从仂于 仆舒亟 仂弍仍舒�������� 仗��仂��仄仂����舒 ��仂仂弍��亠仆亳亶"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "��仂从舒亰��于舒���� ��仂从��舒��亠仆仆��亠 亰舒亞仂仍仂于从亳 仗��亳 仗��仂��仄仂����亠 ��仂仂弍��亠仆亳亶"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "��舒������仂�礌亳亠 仄亠亢亟�� ������仂从舒仄亳"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "仗亳从��亠仍亠亶"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "����仂从������从舒"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "��仂仍仂于亳仆舒 ������舒仆亳����"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "��仍舒于仆舒�� 仗��仂从������从舒"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "丿舒亞"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr "��舒������舒弍亳��仂于舒���� 仗��亳��仂亠亟亳仆亠仆仆��亠 亳亰仂弍��舒亢亠仆亳�� 仗仂 ��舒亰仄亠���� 仂从仆舒"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "��舒������仂亶从舒 仂��仂弍��舒亢亠仆亳�� 亰舒亞仂仍仂于从仂于"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "��于��仂仄舒��亳��亠��从亳 仗��仂于亠�������� 仗仂亟仗亳��亳"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "��仂从舒亰��于舒���� ��亠亰��仍����舒�� 仗��仂于亠��从亳 仗仂亟仗亳��亳 于 仂��亟亠仍��仆仂仄 仂从仆亠"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "弌仂����舒仆������ 仗舒��仂仍��仆���� ����舒亰�� 于 仗舒仄����亳"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "丕亟舒仍������ ��亠��亠亰"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "仄亳仆����"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(����亳 ������舒仆仂于从亠 于 0 仗舒��仂仍��仆舒�� ����舒亰舒 弍��亟亠�� ����舒仆亳��������\n"
 " 于 ��亠��亠仆亳亠 于��亠亞仂 ��亠舒仆��舒)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "��舒��于舒��亳���� 于于仂亟 仗��亳 亰舒仗��仂��亠 仗舒��仂仍��"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "����于仂亟亳���� 仗��亠亟��仗��亠亢亟亠仆亳亠 仗��亳 亰舒仗����从亠, 亠��仍亳 GnuPG 仆亠 ��舒弍仂��舒亠��"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "����亠亞亟舒 仂��从����于舒���� ��仂仂弍��亠仆亳亠 亟仍�� 仗��仂��仄仂����舒 仗��亳 于��亟亠仍亠仆亳亳 于 ��仗亳��从亠"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "����从�������� 仗亠��于仂亠 仆亠仗��仂��亳��舒仆仆仂亠 ��仂仂弍��亠仆亳亠 仗��亳 于��仂亟亠 于 仗舒仗从��"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "��仂仄亠��舒���� ��仂仂弍��亠仆亳亠 从舒从 仗��仂��亳��舒仆仆仂亠 ��仂仍��从仂 仗仂��仍亠 仂��从������亳�� 于 仆仂于仂仄 仂从仆亠"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "��亠��亠亶��亳 于 仗舒仗从�� \"����仂亟����亳亠\" 仗仂��仍亠 仗��亳亠仄舒 仆仂于���� ��仂仂弍��亠仆亳亶"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "��亠仄亠亟仍亠仆仆仂 于��仗仂仍仆������ 仗亠��亠仄亠��亠仆亳亠 亳 ��亟舒仍亠仆亳亠 ��仂仂弍��亠仆亳亶"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(弌仂仂弍��亠仆亳�� 弍��亟���� 仗��仂����仂 仗仂仄亠��亠仆�� 亟仂 于��仗仂仍仆亠仆亳��, 亠��仍亳\n"
 " ����舒 仂仗��亳�� 仆亠 于从仍�ﾑ�亠仆舒)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "��从仆仂 仗��亳亠仄舒 ��仂仂弍��亠仆亳亶"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "��仂从舒亰��于舒���� 仂从仆仂 仗��亳亠仄舒 ��仂仂弍��亠仆亳亶"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "����亠亞亟舒"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr "丐仂仍��从仂 仗��亳 ������仆仂仄 亰舒仗����从亠 仗��亳亠仄舒"
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "��亳从仂亞亟舒"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "��亠 仂��仂弍��舒亢舒���� ��仂仂弍��亠仆亳亠 仂弍 仂��亳弍从亠 仗��亳 仗仂仍����亠仆亳亳 ��仂仂弍��亠仆亳亶"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "��舒从����于舒���� 仂从仆仂 仗��亳亠仄舒 ��仂仂弍��亠仆亳亶 仗仂��仍亠 亰舒于亠����亠仆亳��"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " 丕����舒仆仂于亳���� 从仍舒于亳舒������仆��亠 从仂仄舒仆亟��... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "��仆亠��仆亳亠 从仂仄舒仆亟�� (%s 弍��亟亠�� 亰舒仄亠仆亠仆 仆舒 亳仄�� ��舒亶仍舒/URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Web-弍��舒��亰亠��"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "��仂弍舒于仍������ 舒亟��亠�� 于 ��仗亳��仂从 舒亟��亠��舒��仂于 仗仂 亟于仂亶仆仂仄�� ��亠仍��从��"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "����亳 于����仂亟亠"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "��仂亟��于亠��亢亟亠仆亳亠 仗��亳 于����仂亟亠"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "����亳��舒���� 从仂��亰亳仆�� 仗��亳 于����仂亟亠"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "弌仗��舒��亳于舒���� 仗亠��亠亟 仂��亳����从仂亶"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "����亠亟��仗��亠亢亟舒���� 仂 仆舒仍亳��亳亳 ��仂仂弍��亠仆亳亶 于 仂��亠��亠亟亳"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "����亠仄�� 仂亢亳亟舒仆亳�� 仂��于亠��舒 亳亰 ��亠��亳:"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "��亠从��仆亟"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "��仂从��舒��亠仆仆仂亠 仆舒亰于舒仆亳亠 亟仆�� 仆亠亟亠仍亳"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "仗仂仍仆仂亠 仆舒亰于舒仆亳亠 亟仆�� 仆亠亟亠仍亳"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "��仂从��舒��亠仆仆仂亠 仆舒亰于舒仆亳亠 仄亠������舒"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "仗仂仍仆仂亠 仆舒亰于舒仆亳亠 仄亠������舒"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "仗��亠亟仗仂����亳��亠仍��仆��亶 ��仂��仄舒�� 亟舒���� 亳 于��亠仄亠仆亳 亟仍�� 于��弍��舒仆仆仂亶 ������舒仆��"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "于亠从 (亞仂亟/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "亟亠仆�� 仄亠������舒"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "��舒��, 24-��舒��仂于仂亠 仗��亠亟����舒于仍亠仆亳亠"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "��舒��, 12-��舒��仂于仂亠 仗��亠亟����舒于仍亠仆亳亠"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "亟亠仆�� 亞仂亟舒"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "仆仂仄亠�� 仄亠������舒"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "仄亳仆����舒"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "AM 亳仍亳 PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "��亠从��仆亟舒"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "仆仂仄亠�� 亟仆�� 仆亠亟亠仍亳"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "仗��亠亟仗仂����亳��亠仍��仆��亶 ��仂��仄舒�� 亟舒���� 亟仍�� 于��弍��舒仆仆仂亶 ������舒仆��"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "仗仂��仍亠亟仆亳亠 亟于亠 ��亳������ 亞仂亟舒"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "亞仂亟 仗仂仍仆仂��������"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "亳仄�� 亳仍亳 ��仂从��舒��亠仆亳亠 于��亠仄亠仆仆仂亶 亰仂仆��"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "亅仍亠仄亠仆�� ��仂��仄舒��舒"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "��仗亳��舒仆亳亠"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "����亳仄亠��"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "��舒������仂亶从舒 ��于亠��仂于 ��仂仂弍��亠仆亳亶"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "丶于亠��舒"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "丶亳��舒��舒 - ��亠��于��亶 ����仂于亠仆��"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "丶亳��舒��舒 - ����仂��仂亶 ����仂于亠仆��"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "丶亳��舒��舒 - 丐��亠��亳亶 ����仂于亠仆��"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "弌����仍从舒 (URI)"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "丶亳从仍亳��亠��从亳 亳��仗仂仍��亰仂于舒���� ��于亠��舒 ��亳��舒��"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "����弍亠��亳��亠 ��于亠�� 亟仍�� ��亳��舒�� ����仂于仆�� 1"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "����弍亠��亳��亠 ��于亠�� 亟仍�� ��亳��舒�� ����仂于仆�� 2"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "����弍亠��亳��亠 ��于亠�� 亟仍�� ��亳��舒�� ����仂于仆�� 3"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "����弍亠��亳��亠 ��于亠�� 亟仍�� ������仍仂从 (URI)"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "��仗亳��舒仆亳亠 ��亳仄于仂仍仂于"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4920,11 +4933,11 @@ msgstr ""
 "������仗仗�� 仆仂于仂����亠亶\n"
 "Message-ID"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "����仍亳 x ������舒仆仂于仍亠仆仂, 仂��仂弍��舒亢舒亠�� expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4938,7 +4951,7 @@ msgstr ""
 "弌仂亟亠��亢亳仄仂亠 ��仂仂弍��亠仆亳�� 弍亠亰 仗仂亟仗亳��亳 ��仂 亰仆舒从仂仄 ��亳��舒����\n"
 "弌亳仄于仂仍 '%'"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4950,15 +4963,15 @@ msgstr ""
 "弌亳仄于仂仍 '{'\n"
 "弌亳仄于仂仍 '}'"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "����弍仂�� ����亳����舒"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "��仍舒于亳舒������仆��亠 从仂仄舒仆亟��"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4969,11 +4982,11 @@ msgstr ""
 "仆舒亢仄亳��亠 ������ 从仍舒于亳���� (亳仍亳 从仂仄弍亳仆舒��亳�� 从仍舒于亳��), ������舒仆仂于亳于 ��从舒亰舒��亠仍��\n"
 "仆舒 仆��亢仆���� 从仂仄舒仆亟�� 于 仄亠仆��."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "��仂 ��仄仂仍��舒仆亳��"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "弌��舒��舒�� Sylpheed"
 
@@ -5041,190 +5054,185 @@ msgstr "��舒������仂亶从舒 ��亳仍������仂于"
 msgid "Enabled"
 msgstr "��从仍."
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "���� ��仂��亳��亠 ��亟舒仍亳���� 仗��舒于亳仍仂?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "��亠亰 仆舒亰于舒仆亳��"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "丕亟舒仍亠仆亳亠 仗��舒于亳仍舒"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 msgid "Filter rule"
 msgstr "����舒于亳仍仂 ��亳仍������舒��亳亳"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr "����仍亳 仍�ﾐ頴笑� 亳亰 ��仍亠亟���ﾑ�亳�� ����仍仂于亳亶 于��仗仂仍仆�磳������:"
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr "����仍亳 于��亠 ��仍亠亟���ﾑ�亳亠 ����仍仂于亳�� 于��仗仂仍仆���ﾑ�����:"
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr "����仗仂仍仆亳���� ��仍亠亟���ﾑ�亳亠 亟亠亶����于亳��:"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr "To 亳仍亳 Cc"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 msgid "Any header"
 msgstr "���ﾐ頴笑� 亰舒亞仂仍仂于仂从"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 msgid "Edit header..."
 msgstr "��亰仄亠仆亳���� 亰舒亞仂仍仂于从亳..."
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 msgid "Message body"
 msgstr "丐亠仍仂 ��仂仂弍��亠仆亳��"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr "��亠亰��仍����舒�� 从仂仄舒仆亟��"
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr "��仂亰��舒���� ��仂仂弍��亠仆亳��"
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "��仂亟亠��亢亳��"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 msgid "doesn't contain"
 msgstr "仆亠 ��仂亟亠��亢亳��"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr "��仂于仗舒亟舒亠�� ��"
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr "仆亠 ��仂于仗舒亟舒亠�� ��"
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr "��仂仂��于亠������于��亠�� regex"
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr "仆亠 ��仂仂��于亠������于��亠�� regex"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr "弍仂仍����亠, ��亠仄"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr "仄亠仆����亠, ��亠仄"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr "弍仂仍����亠, ��亠仄"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr "仄亠仆����亠, ��亠仄"
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "��亠��亠仄亠����亳���� 于"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 msgid "Copy to"
 msgstr "��仂仗亳��仂于舒���� 于"
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "��亠 仗��亳仆亳仄舒����"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 msgid "Delete from server"
 msgstr "丕亟舒仍亳���� �� ��亠��于亠��舒"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 msgid "Set mark"
 msgstr "����仄亠��亳����"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 msgid "Set color"
 msgstr "丕����舒仆仂于亳���� ��于亠��"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 msgid "Mark as read"
 msgstr "��仂仄亠��亳���� 从舒从 仗��仂��亳��舒仆仆仂亠"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 msgid "Forward as attachment"
 msgstr "��亠��亠��仍舒���� 从舒从 于仍仂亢亠仆亳亠"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 msgid "Redirect"
 msgstr "��亠��亠仆舒仗��舒于亳���� 弍亠亰 亳亰仄亠仆亠仆亳亶"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 msgid "Execute command"
 msgstr "����仗仂仍仆亳���� 从仂仄舒仆亟��"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr "����亠从��舒��亳���� 仂弍��舒弍仂��从�� 仗��舒于亳仍"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 msgid "folder:"
 msgstr "仗舒仗从��:"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 msgid "address:"
 msgstr "舒亟��亠��:"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 msgid "Edit header list"
 msgstr "弌仗亳��仂从 亰舒亞仂仍仂于从仂于"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 msgid "Headers"
 msgstr "��舒亞仂仍仂于从亳"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 msgid "Header:"
 msgstr "��舒亞仂仍仂于仂从:"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 msgid "Rule name is not specified."
 msgstr "��亠 ��从舒亰舒仆仂 亳仄�� 仗��舒于亳仍舒."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 msgid "Command is not specified."
 msgstr "��亠 ��从舒亰舒仆舒 从仂仄舒仆亟仆舒�� ������仂从舒."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr "丕从舒亰舒仆仂 仆亠亟仂仗������亳仄仂亠 ����仍仂于亳亠."
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 msgid "Destination folder is not specified."
 msgstr "��舒仗从舒 仆舒亰仆舒��亠仆亳�� 仆亠 ��从舒亰舒仆舒."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr "丕从舒亰舒仆仂 仆亠亟仂仗������亳仄仂亠 亟亠亶����于亳亠."
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 msgid "Condition not exist."
 msgstr "��亠 ��从舒亰舒仆仂 ����仍仂于亳亠."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 msgid "Action not exist."
 msgstr "��亠 ��从舒亰舒仆仂 亟亠亶����于亳亠."
 
@@ -5480,56 +5488,56 @@ msgstr "弌仂亠亟亳仆亠仆亳亠"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "弌仂亠亟亳仆亠仆亳亠 �� ��亠��于亠��仂仄 SMTP: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "��亠��亠亟舒��舒 HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "������亠仆��亳��亳从舒��亳��"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "����仗��舒于从舒 ��仂仂弍��亠仆亳��..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "��亠��亠亟舒��舒 EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "��亠��亠亟舒��舒 MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "����仗��舒于从舒"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "��亠��亠亟舒��舒 RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "����仗��舒于从舒 亟舒仆仆����..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "��舒于亠����亠仆亳亠..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "����仗��舒于从舒 ��仂仂弍��亠仆亳�� (%d / %d 弍舒亶��)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "����仗��舒于从舒 ��仂仂弍��亠仆亳��"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "����仂亳亰仂��仍舒 仂��亳弍从舒 仗��亳 仂��仗��舒于从亠 ��仂仂弍��亠仆亳��."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5836,120 +5844,120 @@ msgstr "��仂仄亠��"
 msgid "Creating summary view...\n"
 msgstr "弌仂亰亟舒仆亳亠 仂弍仍舒����亳 仗��仂��仄仂����舒 ��仗亳��从舒...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "��弍��舒弍仂��从舒 仄亠��仂从"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "��亠��从仂仍��从仂 仄亠��仂从 仂����舒仍仂����. ��弍��舒弍仂��舒���� 亳��?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "����仂��仄仂���� 仗舒仗从亳 (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "��亠�� 仆亠仗��仂��亳��舒仆仆���� ��仂仂弍��亠仆亳亶"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "��亠仗��仂��亳��舒仆仆��亠 ��仂仂弍��亠仆亳�� 仆亠 仆舒亶亟亠仆��. ����仂亟仂仍亢亳���� 仗仂亳��从 �� 从仂仆��舒?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "��亠�� 仆亠仗��仂��亳��舒仆仆���� ��仂仂弍��亠仆亳亶."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "��亠仗��仂��亳��舒仆仆��亠 ��仂仂弍��亠仆亳�� 仆亠 仆舒亶亟亠仆��. ��亠��亠亶��亳 从 ��仍亠亟���ﾑ�亠亶 仗舒仗从亠?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "����从舒���� ��仆仂于舒"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "��亠�� 仆仂于���� ��仂仂弍��亠仆亳亶"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "��仂于��亠 ��仂仂弍��亠仆亳�� 仆亠 仆舒亶亟亠仆��. ����仂亟仂仍亢亳���� 仗仂亳��从 �� 从仂仆��舒?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "��亠�� 仆仂于���� ��仂仂弍��亠仆亳亶."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "��仂于��亠 ��仂仂弍��亠仆亳�� 仆亠 仆舒亶亟亠仆��. ��亠��亠亶��亳 从 ��仍亠亟���ﾑ�亠亶 仗舒仗从亠?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "��亠�� 仂��仄亠��亠仆仆���� ��仂仂弍��亠仆亳亶"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "����仄亠��亠仆仆��亠 ��仂仂弍��亠仆亳�� 仆亠 仆舒亶亟亠仆��. ����仂亟仂仍亢亳���� 仗仂亳��从 �� 从仂仆��舒?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "��亠�� 仂��仄亠��亠仆仆���� ��仂仂弍��亠仆亳亶"
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "����仄亠��亠仆仆��亠 ��仂仂弍��亠仆亳�� 仆亠 仆舒亶亟亠仆��. ����仂亟仂仍亢亳���� 仗仂亳��从 �� 仆舒��舒仍舒?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "��亠�� 于��亟亠仍亠仆仆���� ��于亠��仂仄 ��仂仂弍��亠仆亳亶"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "����亟亠仍亠仆仆��亠 ��于亠��仂仄 ��仂仂弍��亠仆亳�� 仆亠 仆舒亶亟亠仆��. ����仂亟仂仍亢亳���� 仗仂亳��从 �� 从仂仆��舒?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "��亠�� 于��亟亠仍亠仆仆���� ��于亠��仂仄 ��仂仂弍��亠仆亳亶."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "����亟亠仍亠仆仆��亠 ��于亠��仂仄 ��仂仂弍��亠仆亳�� 仆亠 仆舒亶亟亠仆��. ����仂亟仂仍亢亳���� 仗仂亳��从 �� 仆舒��舒仍舒?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "������仗仗亳��仂于从舒 ��仂仂弍��亠仆亳亶 仗仂 ��亠仄舒仄..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d ��亟舒仍亠仆仂"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 仗亠��亠仄亠��亠仆仂"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d ��从仂仗亳��仂于舒仆仂"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " ��仂仂弍��亠仆亳亶 于��弍��舒仆仂"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 仆仂于����, %d 仆亠仗��仂��亳��舒仆仆����, %d 于��亠亞仂 (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 仆仂于����, %d 仆亠仗��仂��亳��舒仆仆����, %d 于��亠亞仂"
@@ -6121,6 +6129,9 @@ msgstr "%.2f ��弍"
 msgid "writing to %s failed.\n"
 msgstr "亰舒仗亳���� 于 %s 仆亠 ��亟舒仍舒����.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "��亠��亠������仂亶从舒 于��亠�� 亟亠��亠于��亠于 仗舒仗仂从 ..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/��亳亟/��仂亟亳��仂于从舒/---"
 
diff --git a/po/sk.po b/po/sk.po
index e66a4215..82ddd62d 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+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"
@@ -64,11 +64,11 @@ msgstr ""
 "programom. Ak to tak nie je, nap鱈邸te na adresu Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Na��鱈tavam nastavenia pre v邸etky kont叩...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -76,19 +76,19 @@ msgstr ""
 "S炭 otvoren辿 okn叩 s rozp鱈san箪mi spr叩vami.\n"
 "Pros鱈m zatvorte v邸etky tieto okn叩 predt箪m, ako za��nete meni泥 nastavenia k担nt."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Otv叩ram okno pre nastavenie konta...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Vytv叩ram okno pre nastavenie konta...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "��prava k担nt"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -96,8 +96,8 @@ msgstr ""
 "Nov辿 spr叩vy bud炭 kontrolovan辿 v tomto porad鱈. Ak m叩 by泥 konto kontrolovan辿\n"
 "pri vo直be 'Prija泥 v邸etko', zatrhnite pol鱈��ko v st頂pci ozna��enom 'G'."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -105,60 +105,66 @@ msgstr ""
 msgid "Name"
 msgstr "Meno"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Prida泥"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Upravi泥"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr "Zmaza泥"
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Nadol"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Nahor"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr "Nastavi泥 ako v箪chodzie konto"
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Naozaj chcete zmaza泥 toto konto?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Bez n叩zvu"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Zmaza泥 konto"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "Naozaj chcete zmaza泥 toto konto?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "��no"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Nie"
 
@@ -227,7 +233,7 @@ msgstr " Odosla泥 "
 msgid "Abort"
 msgstr "Ukon��i泥"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -238,11 +244,11 @@ msgstr ""
 "(`%%h' bude nahraden辿 parametrom)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "Skryt箪 pou転鱈vate直sk箪 parameter pre akciu"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -253,7 +259,7 @@ msgstr ""
 "(`%%h' bude nahraden辿 parametrom)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "Pou転鱈vate直sk箪 parameter pre akciu"
 
@@ -261,7 +267,7 @@ msgstr "Pou転鱈vate直sk箪 parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Prida泥 adresu do adres叩ra"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres叩r"
@@ -347,8 +353,8 @@ msgstr "/_Adresa/_Upravi泥"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_maza泥"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_N叩stroje"
 
@@ -356,13 +362,13 @@ msgstr "/_N叩stroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_N叩stroje/Importova泥 s炭bor _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/N叩po_veda"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/N叩po_veda/_O programe"
 
@@ -379,10 +385,10 @@ msgid "/New _Folder"
 msgstr "/Nov箪 _Prie��inok"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -401,17 +407,17 @@ msgstr "/Z_maza泥"
 msgid "E-Mail address"
 msgstr "E-mailov叩 adresa"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Otvori泥 adres叩r"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Meno:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -581,7 +587,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Prie��inok"
 
@@ -605,7 +611,7 @@ msgstr "Spolo��n叩 adresa"
 msgid "Personal address"
 msgstr "S炭kromn叩 adresa"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -613,7 +619,7 @@ msgstr "Upozornenie"
 msgid "Warning"
 msgstr "Varovanie"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Chyba"
 
@@ -625,31 +631,31 @@ msgstr "Vytv叩ram dial坦g pre varovania...\n"
 msgid "Show this message next time"
 msgstr "Zobrazi泥 t炭to spr叩vu nabud炭ce"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Oran転ov叩"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "��erven叩"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Ru転ov叩"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Bledomodr叩"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Modr叩"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Zelen叩"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Hned叩"
 
@@ -657,7 +663,7 @@ msgstr "Hned叩"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "貼iadna"
 
@@ -669,8 +675,8 @@ msgstr "/_Prida泥..."
 msgid "/_Remove"
 msgstr "/_Odstr叩ni泥"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
@@ -835,8 +841,8 @@ msgstr "/_Zobrazi泥/_Odpove�� komu"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_Zobrazi泥/---"
 
@@ -863,7 +869,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -946,140 +952,145 @@ msgstr "/_Zobrazi泥/_K坦dovanie/Zjednodu邸en叩 ��鱈n邸tina (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_Zobrazi泥/_K坦dovanie/Zjednodu邸en叩 ��鱈n邸tina (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Zobrazi泥/_K坦dovanie/Tradi��n叩 ��鱈n邸tina (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Zobrazi泥/_K坦dovanie/Tradi��n叩 ��鱈n邸tina (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Zobrazi泥/_K坦dovanie/K坦rea (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Zobrazi泥/_K坦dovanie/Thajsko (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Zobrazi泥/_K坦dovanie/Thajsko (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_N叩stroje/_Adres叩r"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_N叩stroje/��a_bl坦na"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_N叩stroje/A_kcie"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_N叩stroje/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/��p_ravy/Upravi泥 e_xtern箪m editorom"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_N叩stroje/A_kcie"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Sp_r叩va/_Za邸ifrova泥"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: s炭bor neexistuje\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Ned叩 sa z鱈ska泥 ��as泥 textu\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Chyba v 炭vodzovk叩ch."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Chyba form叩tu odpovede/preposielania."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "S炭bor %s neexistuje\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ned叩 sa zisti泥 d頂転ka s炭boru %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "S炭bor %s je pr叩zdny."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "Ned叩 sa ��鱈ta泥 %s."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Spr叩va: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Ned叩 sa z鱈ska泥 ��as泥 viacdielnej spr叩vy."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr "[Upraven辿]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - P鱈sanie spr叩vy%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "P鱈sanie spr叩vy%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Nie je ur��en箪 pr鱈jemca."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Odosla泥"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je pr叩zdny. Odosla泥 napriek tomu?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "ned叩 sa z鱈ska泥 zoznam pr鱈jemcov."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1087,26 +1098,26 @@ msgstr ""
 "Nie je ur��en辿 konto pre odosielanie spr叩v.\n"
 "Pred odosielan鱈m pros鱈m zvo直te po邸tov辿 konto."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielan鱈 spr叩vy na %s nastala chyba."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Spr叩va sa ned叩 ulo転i泥 medzi odoslan辿 spr叩vy."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nem担転em n叩js泥 転iadny k直炭�� asociovan箪 so zvolen箪m ID k直炭��a `%s'."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "ned叩 sa zmeni泥 m坦d s炭boru\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1116,140 +1127,140 @@ msgstr ""
 "%s na %s.\n"
 "Odosla泥 spr叩vu aj napriek tomu?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "ned叩 sa zap鱈sa泥 hlavi��ka\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "ned叩 sa odstr叩ni泥 star叩 spr叩va\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "zara��ujem spr叩vu do fronty...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "nem担転em n叩js泥 prie��inok Na odoslanie\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "nem担転em zaradi泥 spr叩vu do fronty\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovan箪 Message-ID: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Vytv叩ram okno pre p鱈sanie spr叩vy...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Ve直kos泥"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Odosla泥 spr叩vu"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Odosla泥 nesk担r"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "Zaradi泥 spr叩vu do prie��inka Na odoslanie a odosla泥 nesk担r"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Ulo転i泥 medzi koncepty"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Vlo転i泥"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Vlo転i泥 obsah s炭boru"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Pripoji泥"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Pripoji泥 s炭bor"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Vlo転i泥 podpis"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Upravi泥 pomocou extern辿ho editoru"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Riadkovanie"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Zalomi泥 v邸etky dlh辿 riadky"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Neplatn箪 MIME typ."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "S炭bor neexistuje alebo je pr叩zdny."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "K坦dov叩 str叩nka"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "N叩zov s炭boru"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatn箪 pr鱈kaz pre extern箪 editor: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1260,72 +1271,72 @@ msgstr ""
 "Ukon��i泥 ho n叩silne?\n"
 "skupinov箪 ID procesu: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Ukon��en叩 skupina procesov s ID: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Do��asn箪 s炭bor: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "P鱈sanie: vstup z extern辿ho procesu\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Ned叩 sa spusti泥 extern箪 editor\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Ned叩 sa zapisova泥 do s炭boru\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Ned叩 sa ��鱈ta泥 z potrubia\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Spr叩va sa ned叩 zaradi泥 do fronty."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "Vybra泥 s炭bor"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "Vybra泥 s炭bor"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Zru邸i泥 spr叩vu"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Obsah spr叩vy sa zmenil. Chcete zahodi泥 zmeny?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Zahodi泥"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "medzi Koncepty"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete pou転i泥 邸abl坦nu `%s' ?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Pou転i泥 邸abl坦nu"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Nahradi泥"
 
@@ -1487,12 +1498,12 @@ msgstr "Upravi泥 prie��inok"
 msgid "Input the new name of folder:"
 msgstr "Zadajte nov箪 n叩zov prie��inka:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Nov箪 prie��inok"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Zadajte n叩zov nov辿ho prie��inka:"
 
@@ -1662,162 +1673,158 @@ msgstr "nepodarilo sa zap鱈sa泥 nastavenie do s炭boru\n"
 msgid "Select folder"
 msgstr "Zvo直te prie��inok"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Prijat辿"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Odoslan辿"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Na odoslanie"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Odpadkov箪 k担邸"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "Nov箪 Prie��inok"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "N叩zov prie��inka nem担転e obsahova泥 `%c'."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Prie��inok `%s' u転 existuje."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ned叩 sa vytvori泥 prie��inok `%s'."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/Vytvori泥 _nov箪 prie��inok..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/_Premenova泥 prie��inok..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/_Zmaza泥 prie��inok"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Vypr叩zdni泥 k担邸"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/P_rija泥 nov辿 spr叩vy"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnovi泥 邸trukt炭ru prie��inkov"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/Vy_h直ada泥 v spr叩vach..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "貼iadne nepre��鱈tan辿 spr叩vy."
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prih_l叩si泥 sa do diskusnej skupiny"
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/Odstr叩ni泥 _diskusn炭 skupinu"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Vytv叩ram n叩h直ad pre prie��inok...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Nov箪"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Nepre��鱈tan辿"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Nastavujem inform叩cie o prie��inku...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Nastavujem inform叩cie o prie��inku..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preh直ad叩vam prie��inok %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preh直ad叩vam prie��inok %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "Obnovi泥 strom prie��inkov"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Strom prie��inkov bude obnoven箪. Pokra��ova泥?"
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom prie��inku..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 msgid "Rebuilding of the folder tree failed."
 msgstr "Obnova stromu prie��inku sa nepodarila."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Obnovujem strom v邸etk箪ch prie��inkov..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nov辿 spr叩by vo v邸etk箪ch prie��inkoch..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Prie��inok %s je zvolen箪\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Odosielam spr叩vu..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Pri odosielan鱈 spr叩vy na %s nastala chyba."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1827,16 +1834,16 @@ msgstr ""
 "(Ak chcete vytvori泥 prie��inok s ��al邸鱈mi podzlo転kami,\n"
 "pridajte na koniec n叩zvu '/')"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nov箪 n叩zov pre `%s':"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Premenova泥 prie��inok"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1845,24 +1852,24 @@ msgstr ""
 "V邸etky prie��inky a spr叩vy v `%s' bud炭 odstr叩nen辿.\n"
 "Naozaj pokra��ova泥?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Odstr叩ni泥 prie��inok"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Prie��inok '%s' sa ned叩 odstr叩ni泥."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "Vypr叩zdni泥 k担邸"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "Zmaza泥 v邸etky spr叩vy v ko邸i?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1871,34 +1878,34 @@ msgstr ""
 "Naozaj chcete odstr叩ni泥 schr叩nku '%s' ?\n"
 "(Spr叩vy NEBUD�� odstr叩nen辿 z disku)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Odstr叩ni泥 schr叩nku"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstr叩ni泥 IMAP4 konto '%s'?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Odstr叩ni泥 IMAP4 konto"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstr叩ni泥 diskusn炭 skupinu '%s'?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Odstr叩ni泥 diskusn炭 skupinu"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstr叩ni泥 news konto '%s'?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Odstr叩ni泥 news konto"
 
@@ -1946,7 +1953,7 @@ msgstr "nezn叩ma"
 msgid "Can't retrieve newsgroup list."
 msgstr "Ned叩 sa z鱈ska泥 zoznam diskusn箪ch skup鱈n."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Hotovo."
 
@@ -2229,7 +2236,7 @@ msgstr "Importova泥 s炭bor LDIF do adres叩ra"
 msgid "Prev"
 msgstr "Predch叩dzaj炭ci"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "Nasleduj炭ca"
 
@@ -2320,7 +2327,7 @@ msgstr "Prip叩jam sa k serveru POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripoji泥 k serveru POP3: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Autentiz叩cia..."
 
@@ -2350,7 +2357,7 @@ msgstr "Z鱈skavam ve直kos泥 spr叩v (LIST)..."
 msgid "Deleting message %d"
 msgstr "Odstra��ujem spr叩vu %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Odp叩jam sa"
 
@@ -2393,7 +2400,8 @@ msgstr "Ned叩 sa zapisova泥 do s炭boru."
 msgid "Socket error."
 msgstr "Chyba socketu."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "Vzdialen箪 hostite直 ukon��il spojenie."
 
@@ -2410,11 +2418,11 @@ msgstr ""
 "Mailbox je zamknut箪:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "Autentiz叩cia bola ne炭spe邸n叩."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2423,7 +2431,7 @@ msgstr ""
 "Autentiz叩cia bola ne炭spe邸n叩:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 #, fuzzy
 msgid "Session timed out."
 msgstr "��as spojenia vypr邸al\n"
@@ -2847,324 +2855,324 @@ msgstr "/_Zobrazi泥/_K坦dovanie/Japonsko (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Zobrazi泥/_K坦dovanie/Japonsko (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Zobrazi泥/_K坦dovanie/��鱈n邸tina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Zobrazi泥/_K坦dovanie/K坦rea (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Zobrazi泥/Otvori泥 v _novom okne"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_Zobrazi泥/Zdrojov箪 k坦d spr叩v_y"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_Zobrazi泥/Zobrazi泥 v邸etky _hlavi��ky"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_Zobrazi泥/_Aktualizova泥 zoznam"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/Sp_r叩va"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 msgid "/_Message/Recei_ve"
 msgstr "/Sp_r叩va/_Prija泥"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Sp_r叩va/_Prija泥/Z _aktu叩lneho konta"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Sp_r叩va/_Prija泥/Zo _v邸etk箪ch k担nt"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/Sp_r叩va/_Prija泥/_Ukon��i泥 prij鱈manie"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 msgid "/_Message/Recei_ve/---"
 msgstr "/Sp_r叩va/_Prija泥/---"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/Sp_r叩va/_Odosla泥 spr叩vy vo fronte"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/Sp_r叩va/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/Sp_r叩va/_Nap鱈sa泥 nov炭 spr叩vu"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/Sp_r叩va/O_dpoveda泥"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/Sp_r叩va/Odpo_veda泥 komu"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Sp_r叩va/Odpoved_a泥 komu/_v邸etk箪m"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Sp_r叩va/Od_poveda泥 komu/_odosielate直ovi"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Sp_r叩va/Od_poveda泥 komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/Sp_r叩va/_Posla泥 ��alej"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/Sp_r叩va/Posla泥 ako p_r鱈lohu"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/Sp_r叩va/Pre_smerova泥"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/Sp_r叩va/Pres_un炭泥"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/Sp_r叩va/_Kop鱈rova泥"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/Sp_r叩va/Z_maza泥"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/Sp_r叩va/O_zna��i泥"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Sp_r叩va/O_zna��i泥/O_zna��i泥"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Sp_r叩va/O_zna��i泥/O_dzna��i泥"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/Sp_r叩va/O_zna��i泥/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Sp_r叩va/O_zna��i泥/Ozna��i泥 ako _nepre��鱈tan辿"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Sp_r叩va/O_zna��i泥/Ozna��i泥 ako _pre��鱈tan辿"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Sp_r叩va/O_zna��i泥/Ozna��i泥 _v邸etky ako pre��鱈tan辿"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/Sp_r叩va/Znovu _editova泥"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_N叩stroje/Prida泥 _odosielate直a do adres叩ra"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_N叩stroje/_Filtrova泥 spr叩vy"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_N叩stroje/_Filtrova泥 spr叩vy"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_N叩stroje/Vytvori泥 pravidlo fi_ltra"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_N叩stroje/Vytvori泥 pravidlo fi_ltra/_Automaticky"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_N叩stroje/Vytvori泥 pravidlo fi_ltra/pod直a _odosielate直a"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_N叩stroje/Vytvori泥 pravidlo fi_ltra/pod直a _pr鱈jemcu"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_N叩stroje/Vytvori泥 pravidlo fi_ltra/pod直a p_redmetu"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_N叩stroje/Zmaza泥 du_plik叩tne spr叩vy"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_N叩stroje/V_ykona泥"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/_N叩stroje/Okno _z叩znamu"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/Nastav_enia"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_enia/_V邸eobecn辿 nastavenia..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_enia/Nastavenie _filtru..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_enia/��_abl坦na..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_enia/_Akcie..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/Nastav_enia/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_enia/Nastavenia akt鱈vneho _konta..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_enia/Vytvori泥 _nov辿 konto..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_enia/_Upravi泥 kont叩..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_enia/_Zmeni泥 akt鱈vne konto"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/N叩po_veda/_Manu叩l"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/N叩po_veda/_Manu叩l/_Anglicky"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/N叩po_veda/_Manu叩l/_Japonsky"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/N叩po_veda/_FAQ"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/N叩po_veda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/N叩po_veda/_FAQ/_Japonsky"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/N叩po_veda/_FAQ/��_panielsky"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/N叩po_veda/_FAQ/_Franc炭zky"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/N叩po_veda/_FAQ/_Taliansky"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/N叩po_veda/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Vytv叩ram hlavn辿 okno...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavn辿 Okno: alok叩cia farieb %d bola ne炭spe邸n叩\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Bez n叩zvu"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "転iadny"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Men鱈m typ odde直ova��a okien z %d na %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr "Odpojen辿"
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr "Ste odpojen箪. Pripoji泥 sa?"
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vypr叩zdni泥 k担邸"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Zmaza泥 v邸etky spr叩vy v ko邸i?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Prida泥 mailbox"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3174,16 +3182,16 @@ msgstr ""
 "Ak zad叩te existuj炭ci mailbox, bude\n"
 "automaticky preh直adan箪."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' u転 existuje."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3193,144 +3201,144 @@ msgstr ""
 "Pravdepodobne u転 niektor辿 s炭bory existuj炭, alebo tam nem叩te pr叩va na "
 "zapisovanie."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie prie��inku"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie spr叩vy"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Odpoveda泥"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpoveda泥 odosielate直ovi i v邸etk箪m pr鱈jemcom"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dpoveda泥 komu/_odosielate直ovi"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dpoveda泥 komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Posla泥 ��alej"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Posla泥 ��alej ako p_r鱈lohu"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Pr_esmerova泥"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Prija泥"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Prija泥 nov炭 po邸tu"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Prija泥 v邸etko"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "Prija泥 nov炭 po邸tu pre v邸etky kont叩"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Odosla泥 spr叩vy vo fronte"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Nov叩 spr叩va"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Nap鱈sa泥 nov炭 spr叩vu"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Odpoveda泥"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Odpoveda泥 na spr叩vu"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "Odp. v邸etk箪m"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Odpoveda泥 odosielate直ovi i v邸etk箪m pr鱈jemcom"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Posla泥 ��alej"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Posla泥 spr叩vu ��alej"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Zmaza泥 spr叩vu"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Vykona泥"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Vykona泥 ozna��en箪 proces"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "��al邸ia nepre��鱈tan叩 spr叩va"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Nastavenia"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "V邸eobecn辿 nastavenia"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Nastavenie konta"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojen箪. Kliknite na ikonu, ak sa chcete pripoji泥."
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojen箪. Kliknite na ikonu, ak sa chcete odpoji泥."
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Ukon��i泥"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Ukon��i泥 program"
 
@@ -3452,28 +3460,28 @@ msgstr "Dosiahnut箪 koniec spr叩vy; pokra��ova泥 od za��iatku?"
 msgid "Search finished"
 msgstr "H直adanie dokon��en辿"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Vytv叩ram zobrazenie spr叩vy...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Pr鱈lohy"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nem担転em ulo転i泥 s炭bor '%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Tla��i泥"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3482,7 +3490,7 @@ msgstr ""
 "Zadajte pr鱈kazov箪 riadok tla��e:\n"
 "('%s' bude nahraden辿 n叩zvom s炭boru)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3924,7 +3932,7 @@ msgstr "Prija泥 v邸etky spr叩vy na serveri"
 msgid "Receive size limit"
 msgstr "Obmedzenie ve直kosti spr叩vy pre pr鱈jem"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "KB"
 
@@ -3944,7 +3952,7 @@ msgstr "(Nefiltrovan辿 spr叩vy bud炭 umiestnen辿 v tomto prie��inku)"
 msgid "Authentication method"
 msgstr "Met坦da autentiz叩cie"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Automatick叩"
 
@@ -3968,7 +3976,7 @@ msgstr "Generova泥 Message-ID"
 msgid "Add user-defined header"
 msgstr "Prida泥 u転ivate直om definovan辿 hlavi��ky"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Upresni泥... "
 
@@ -4441,30 +4449,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodu邸en叩 ��鱈n邸tina (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Zjednodu邸en叩 ��鱈n邸tina (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradi��n叩 ��鱈n邸tina (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradi��n叩 ��鱈n邸tina (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "��鱈n邸tina (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "K坦rea (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Thajsko (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Thajsko (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4473,11 +4486,11 @@ msgstr ""
 "Po zvolen鱈 'Automatick辿' bude zvolen辿 optim叩lne k坦dovanie\n"
 "pre s炭��asn炭 lokaliz叩ciu."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "K坦dovanie pri prenose"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4486,445 +4499,445 @@ msgstr ""
 "Zadajte hodnotu Content-Transfer-Encoding, ktor叩 bude pou転it叩,\n"
 "ke�� bude spr叩va obsahova泥 in辿 znaky ako ASCII."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Odde直ova�� podpisu"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Vlo転i泥 automaticky"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spusti泥 extern箪 editor"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "Po��et sp辰tn箪ch krokov"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Zalomi泥 spr叩vy na"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "znakoch"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Zalomi泥 cit叩ciu"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Zalamova泥 pri p鱈san鱈"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Zalomi泥 pred odoslan鱈m"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "Automaticky zvoli泥 konto pri odpovedan鱈"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Pri odpovedan鱈 citova泥 spr叩vu"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "Tla��鱈tko Odpoveda泥 zvol鱈 odpove�� do mailinglistu"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Form叩t odpovede"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Zna��ka cit叩cie"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Form叩t posielania ��alej"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Popis znakov "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "P鱈smo"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Prelo転i泥 n叩zov hlavi��ky (ako napr鱈klad 'From:', 'Subject:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Zobrazi泥 po��et nepre��鱈tan箪ch spr叩v pri n叩zve prie��inka"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skr叩ti泥 diskusn辿 skupiny dlh邸ie ako"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "p鱈smen"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Zoznam spr叩v"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Zobrazi泥 pr鱈jemcu v st頂pci 'Od' ak ste odosielate直 vy"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Rozbali泥 vl叩kna"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Form叩t d叩tumu"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " Nastavenie zobrazovan箪ch polo転iek v zozname spr叩v... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Povoli泥 farby v spr叩ve"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Zobrazi泥 viacbajtov炭 abecedu a ��鱈sla ako ASCII znaky (len Japonsko)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Zobrazi泥 panel s hlavi��kami nad spr叩vou"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Zobrazi泥 vybran辿 hlavi��ky v spr叩ve"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Medzera medzi riadkami"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "pixel(ov)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Pos炭vanie"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Pol str叩nky"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Plynul辿 pos炭vanie"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Posun"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Prisp担sobi泥 ve直kos泥 prilo転en箪ch obr叩zkov"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Zobrazovan辿 hlavi��ky"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Automaticky overova泥 podpisy"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Zobrazi泥 v箪sledok overenia ako upozornenie"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Ulo転i泥 heslo do��asne v pam辰ti"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Vymaza泥 z pam辰te za"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "min炭t "
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Nastavte na '0', ak chcete ulo転i泥 heslo do pam辰te\n"
 " a転 do ukon��enia)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Zachyti泥 vstup po��as zad叩vania hesla"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Pri spusten鱈 zobrazi泥 varovanie v pr鱈pade, 転e sa GnuPG ned叩 pou転i泥."
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "Otvori泥 spr叩vu hne�� pri zvolen鱈 v zozname"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Pri vstupe do prie��inka otvori泥 prv炭 nepre��鱈tan炭 spr叩vu"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "Spr叩vu ozna��i泥 ako pre��鱈tan炭 len ak je otvoren叩 v samostatnom okne"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "Po prijat鱈 novej po邸ty sa presun炭泥 do prie��inka prijat箪ch spr叩v"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Pri pres炭van鱈 alebo mazan鱈 spr叩v toto vykona泥 okam転ite"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Spr叩vy bud炭 ozna��en辿 a転 do vykonania,\n"
 " ak je t叩to mo転nos泥 vypnut叩)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Okno prij鱈mania"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Zobrazi泥 okno prij鱈mania"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "V転dy"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr "Len pri manu叩lnom prij鱈man鱈"
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "Nezobrazova泥 upozornenie pri chybe pri prij鱈man鱈"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Po skon��en鱈 zavrie泥 okno prij鱈mania"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " Nastavi泥 kl叩vesov辿 skratky... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Extern辿 pr鱈kazy (%s bude nahraden辿 n叩zvom s炭boru / URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Webov箪 prehliada��"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "Prida泥 adresu k pr鱈jemcom pri dvojkliknut鱈"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "Pri ukon��en鱈"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Potvrdi泥 ukon��enie"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "Vypr叩zdni泥 k担邸 pri ukon��en鱈"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Op箪ta泥 sa pred vypr叩zdnen鱈m"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Upozorni泥, ak s炭 spr叩vy vo fronte"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "��asov箪 limit spojen鱈:"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "sek炭nd"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "skr叩ten箪 n叩zov d��a v t箪転dni"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "n叩zov d��a v t箪転dni"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "skr叩ten箪 n叩zov mesiaca"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "n叩zov mesiaca"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "uprednost��ovan箪 d叩tum a ��as pre s炭��asn炭 lokaliz叩ciu"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "storo��ie (rok/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "de�� v mesiaci"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "��鱈slo hodiny pri pou転it鱈 24-hodinov辿ho ��asu"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "��鱈slo hodiny pri pou転it鱈 12-hodinov辿ho ��asu"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "��鱈slo d��a v roku"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "��鱈slo mesiaca"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "min炭ty"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "AM alebo PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "sekundy"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "poradie d��a v t箪転dni"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "uprednost��ovan箪 d叩tum pre s炭��asn炭 lokaliz叩ciu"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "posledn辿 dve ��鱈slice roku"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "rok"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "��asov叩 z坦na, jej n叩zov alebo skratka"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Popis"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "Pr鱈klad"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Nastavi泥 farby spr叩vy"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Farby"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Citovan箪 text - Prv叩 炭rove��"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Citovan箪 text - Druh叩 炭rove��"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Citovan箪 text - Tretia 炭rove��"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Opakova泥 farby"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "Vyberte farbu pre 1. 炭rove�� cit叩cie"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "Vyberte farbu pre 2. 炭rove�� cit叩cie"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "Vyberte farbu pre 3. 炭rove�� cit叩cie"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "Vyberte farbu pre URI odkazy"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Popis symbolov"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4948,11 +4961,11 @@ msgstr ""
 "Diskusn辿 skupiny\n"
 "Message-ID"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Ak je x zadan辿, zobraz鱈 expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4966,7 +4979,7 @@ msgstr ""
 "Telo citovanej spr叩vy bez podpisu\n"
 "Znak %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4978,15 +4991,15 @@ msgstr ""
 "捗av叩 zlo転en叩 z叩tvorka\n"
 "Prav叩 zlo転en叩 z叩tvorka"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Vo直ba p鱈sma"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Kl叩vesov辿 skratky"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4996,11 +5009,11 @@ msgstr ""
 "M担転ete modifikova泥 skratky ka転d辿ho menu stla��en鱈m\n"
 "po転adovanej skratky po uk叩zan鱈 my邸ou na polo転ku."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "��tandardn辿"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Star邸鱈 Sylpheed"
 
@@ -5068,213 +5081,208 @@ msgstr "Nastavenie filtra"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Naozaj chcete zmaza泥 toto pravidlo?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Bez n叩zvu"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Zmaza泥 pravidlo"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "Zmaza泥 pravidlo"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "Skryt辿 hlavi��ky"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "Hlavi��ka"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "Spr叩va"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "obsahuje"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "neobsahuje"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "Posun炭泥 nadol"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Kop鱈rova泥..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Neprija泥"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "Odstr叩ni泥 prie��inok"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "Pozn叩mky"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "Nastavi泥 farby spr叩vy"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/Oz_na��i泥/Ozna��i泥 ako _pre��鱈tan辿"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Posla泥 ��alej ako p_r鱈lohu"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/Pr_esmerova泥"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "Vykona泥"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "Prie��inok"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "Adres叩r"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "Hlavi��ka"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "Hlavi��ka"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "Hlavi��ka"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Nie je ur��en箪 pr鱈jemca."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Nebol zadan箪 pr鱈kazov箪 riadok."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Nebol zadan箪 cie直."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Nebol zadan箪 pr鱈kazov箪 riadok."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: s炭bor neexistuje\n"
@@ -5531,56 +5539,56 @@ msgstr "Prip叩janie"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Prip叩jam sa k serveru SMTP: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "Posielam HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "Autentiz叩cia"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "Odosielam spr叩vu..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "Posielam EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "Posielam MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "Posielam"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "Posielam RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "Posielam DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Odp叩jam sa..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Odosielam spr叩vu (%d / %d bajtov)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "Odosielam spr叩vu"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "Pri odosielan鱈 spr叩vy nastala chyba."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5888,121 +5896,121 @@ msgstr "��."
 msgid "Creating summary view...\n"
 msgstr "Vytv叩ram zoznam spr叩vy...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Spracova泥 zna��ky"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Ostali nejak辿 zna��ky. Spracova泥?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Preh直ad叩vam prie��inok (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "貼iadne nepre��鱈tan辿 spr叩vy"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Neboli n叩jden辿 転iadne nepre��鱈tan辿 spr叩vy. H直ada泥 od konca?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "貼iadne nepre��鱈tan辿 spr叩vy."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Neboli n叩jden辿 転iadne nepre��鱈tan辿 spr叩vy. Prejs泥 do ��al邸ieho prie��inku?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "H直ada泥 znova"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "貼iadne nov辿 spr叩vy"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Neboli n叩jden辿 転iadne nov辿 spr叩vy. H直ada泥 od konca?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "貼iadne nov辿 spr叩vy."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "Neboli n叩jden辿 転iadne nov辿 spr叩vy. Prejs泥 do ��al邸ieho prie��inku?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "貼iadne ozna��en辿 spr叩vy"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "Neboli n叩jden辿 転iadn辿 ozna��en辿 spr叩vy. H直ada泥 od konca?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "貼iadne ozna��en辿 spr叩vy."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "Neboli n叩jden辿 転iadn辿 ozna��en辿 spr叩vy. H直ada泥 od za��iatku?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "貼iadne zafarben辿 spr叩vy"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Neboli n叩jden辿 転iadne zafarben辿 spr叩vy. H直ada泥 od konca?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "貼iadne zafarben辿 spr叩vy."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Neboli n叩jden辿 転iadne zafarben辿 spr叩vy. H直ada泥 od za��iatku?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Zoskupujem spr叩vu pod直a n叩zvu..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d zmazan箪ch"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d presunut箪ch"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skop鱈rovan箪ch"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " polo転iek zvolen箪ch"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nov箪cvh, %d nepre��鱈tan箪ch, %d celkovo (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nov箪cvh, %d nepre��鱈tan箪ch, %d celkovo"
@@ -6172,6 +6180,9 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "nepodaril sa z叩pis do %s.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Obnovujem strom v邸etk箪ch prie��inkov..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_Zobrazi泥/_K坦dovanie/---"
 
diff --git a/po/sl.po b/po/sl.po
index a67b0521..7f50908f 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+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"
@@ -64,11 +64,11 @@ msgstr ""
 "programom; ��e ga niste, pi邸ite na Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, ZDA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Berem vse nastavitve za vsak ra��un...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -76,19 +76,19 @@ msgstr ""
 "Nekatera okna za sestavljanje sporo��ila so odprta.\n"
 "Pred urejanjem ra��unov zaprite vsa okna za sestavljanje sporo��il."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Odpiram okno za urejanje ra��una...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Ustvarjam okno za urejanje ra��una...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Urejanje ra��unov"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -96,8 +96,8 @@ msgstr ""
 "Nova sporo��ila bodo iskana v tem vrstnem redu. Ozna��ite izbirnike\n"
 "v stolpcu `G', da omogo��ite pobiranje sporo��il z ukazom `Poberi vsa'."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -105,60 +105,66 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Stre転nik"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Dodajanje"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Urejanje"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " Brisanje "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Dol"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Gor"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " Nastavi kot privzet ra��un "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Ali resni��no 転elite izbrisati ta ra��un?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Brez naslova"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Brisanje ra��una"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "Ali resni��no 転elite izbrisati ta ra��un?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Ne"
 
@@ -227,7 +233,7 @@ msgstr " Po邸lji "
 msgid "Abort"
 msgstr "Prekini"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -237,11 +243,11 @@ msgstr ""
 "Vnesite ukazno vrstico za tiskanje:\n"
 "(`%s' se bo nadomestil z imenom datoteke)"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -251,7 +257,7 @@ msgstr ""
 "Vnesite ukazno vrstico za tiskanje:\n"
 "(`%s' se bo nadomestil z imenom datoteke)"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr ""
 
@@ -259,7 +265,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Naslov"
@@ -345,8 +351,8 @@ msgstr "/_Naslov/_Urejanje"
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_Orodja"
 
@@ -354,13 +360,13 @@ msgstr "/_Orodja"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/_Pomo��"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/_Pomo��/_O programu"
 
@@ -377,10 +383,10 @@ msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -399,17 +405,17 @@ msgstr "/_Brisanje"
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -578,7 +584,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Mapa"
 
@@ -602,7 +608,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Opomba"
 
@@ -610,7 +616,7 @@ msgstr "Opomba"
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Napaka"
 
@@ -622,31 +628,31 @@ msgstr "Delam pogovorno okno z alarmno plo邸��o...\n"
 msgid "Show this message next time"
 msgstr "Poka転i to sporo��ilo naslednji��"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Oran転na"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "Rde��a"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Ro転nata"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Sinja"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Modra"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Zelena"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Rjava"
 
@@ -654,7 +660,7 @@ msgstr "Rjava"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Ni��"
 
@@ -666,8 +672,8 @@ msgstr "/_Dodaj"
 msgid "/_Remove"
 msgstr "/_Odstrani"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
@@ -833,8 +839,8 @@ msgstr "/_Ogled/_Odgovor za"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_Pogled/---"
 
@@ -861,7 +867,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -944,140 +950,145 @@ msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitaj邸��ina (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitaj邸��ina (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitaj邸��ina (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitaj邸��ina (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pogled/Nabor zna_kov/Korejski (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi z _zunanjim urejevalnikom"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Sporo��ilo/_Enkripcija"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporo��ila."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Sporo��ilo: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela ve��delnega sporo��ila."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [V urejanju]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Sestavi sporo��ilo%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Sestavi sporo��ilo%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni dolo��en."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Po邸lji"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporo��ila je prazna. Naj kljub temu po邸ljem?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1085,26 +1096,26 @@ msgstr ""
 "Ra��un za po邸iljanje po邸te ni dolo��en.\n"
 "Prosim, pred po邸iljanjem izberite po邸tni ra��un."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Med po邸iljanjem sporo��ila %s je pri邸lo do napake."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporo��ila v imenik Outbox."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Ne najdem tipke, ki bi bila povezana z identifikatorjem tipke `%s'."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1113,141 +1124,141 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporo��ila.\n"
 "Naj ga kljub temu po邸ljem?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "Ne morem zapisati zaglavij\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporo��ila\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "prestavljam sporo��ilo v mapo ��akajo��e...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s ��akajo��imi sporo��ili\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "ne morem prelo転iti sporo��ila\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporo��ila...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Po邸iljatelj:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Po邸lji sporo��ilo"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Po邸lji kasneje"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "Postavi v mapo ��akajo��e in po邸lji kasneje"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Osnutek"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Vstavi"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Vstavi datoteko"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Pripni"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Pripni datoteko"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Vstavi podpis"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Urejanje z zunanjim urejevalnikom"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Prelom vrstic"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Prelomi vse dolge vrstice"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Napa��en tip MIME"
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1258,72 +1269,72 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "��t. skupine procesov: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "��t. prekinjene skupine procesov: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Za��asna datoteka: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Sestavljanje: vhod iz opazovanega procesa\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Ne morem pognati zunanjega urejevalnika\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Ne morem pisati v datoteko\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Branje preko cevi ni uspelo\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Ne morem prelo転iti po邸iljanja sporo��ila."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Zavrzi sporo��ilo"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "To sporo��ilo je bilo spremenjeno. Naj ga zavr転em?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Zavr転i"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "v Draft"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali 転elite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Zamenjaj"
 
@@ -1484,12 +1495,12 @@ msgstr "Urejanje mape"
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -1658,163 +1669,159 @@ msgstr "neuspe邸en poskus zapisa konfiguracije v datoteko\n"
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Prejeto"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Poslano"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "��akajo��e"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Smeti"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "Nova mapa"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Znaka '%c' ne more biti v imenu mape."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mapa '%s' 転e obstaja."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne morem narediti mape '%s'."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/Naredi _novo mapo..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj mapo..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/I_zbri邸i mapo..."
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/_Preveri nova sporo��ila"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/Ponovno z_gradi drevo map"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/_Iskanje sporo��il..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "Ni neprebranih sporo��il."
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Vpis na novi��arsko skupino..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/_Odstrani skupino novic"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Delam mapo View...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Neprebrano"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Nastavljam informacije o mapi...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "Ponovno zgradi drevo map"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Ponovno gradim vsa drevesa map..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Preverjam nova sporo��ila v vseh mapah..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mapa %s je izbrana\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Po邸iljam sporo��ilo"
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Med po邸iljanjem sporo��ila %s je pri邸lo do napake."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1824,16 +1831,16 @@ msgstr ""
 "(��e 転elite narediti mapo za shranjevanje podmap,\n"
 "dodajte '/' na koncu imena datoteke)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Vnesite novo ime za '%s':"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1842,24 +1849,24 @@ msgstr ""
 "Vse mape in sporo��ila pod '%s' bodo izbrisana.\n"
 "Ali jih res 転elite izbrisati?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Izbri邸i mapo"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "Izbri邸em vsa sporo��ila v smetnjaku?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1868,34 +1875,34 @@ msgstr ""
 "Ali naj res odstranim po邸tni predal '%s' ?\n"
 "(Sporo��ila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Odstrani po邸tni predal"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbri邸em ra��un IMAP4 '%s'?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Izbri邸i ra��un IMAP4"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbri邸em novi��arsko skupino '%s'?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Izbri邸i novi��arsko skupino"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbri邸em novi��arski ra��un '%s'?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Izbri邸i novi��arski ra��un"
 
@@ -1943,7 +1950,7 @@ msgstr "neznano"
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne morem potegniti seznama novi��arskih skupin."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Opravljeno."
 
@@ -2231,7 +2238,7 @@ msgstr "Uvozi datoteko LDIF v imenik naslovov"
 msgid "Prev"
 msgstr "Prej邸nji"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "Naslednji"
 
@@ -2322,7 +2329,7 @@ msgstr "Povezujem se s stre転nikom POP: %s"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne morem se povezati s stre転nikom POP: %s%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Overovljam..."
 
@@ -2352,7 +2359,7 @@ msgstr "Ugotavljam velikost sporo��il (LIST)..."
 msgid "Deleting message %d"
 msgstr "Bri邸em sporo��ilo %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Zapu邸��am"
 
@@ -2394,7 +2401,8 @@ msgstr "Ne morem napisati datoteke."
 msgid "Socket error."
 msgstr "napaka v priklju��ku."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2409,19 +2417,19 @@ msgid ""
 "%s"
 msgstr "Po邸tni predal je zaklenjen."
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr ""
 
@@ -2843,329 +2851,329 @@ msgstr "/_Pogled/Nabor zna_kov/Japonski (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pogled/Nabor zna_kov/Kitajski (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pogled/Kodni nabor/Korejski (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Poglej/Odpri v _novem oknu"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_Pogled/I_zvirnik sporo��ila"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_Pogled/Poka転i vsa _zaglavja"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_Sporo��ilo"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Sporo��ilo/Znova ur_edi"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "_Sporo��ilo/Poberi z vseh _ra��unov"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "_Sporo��ilo/Poberi z vseh _ra��unov"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Sporo��ilo/Odpoved sprejeman_ja"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Sporo��ilo/Znova ur_edi"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/_Sporo��ilo/Po邸lji ��akajo��a sporo��_ila"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_Sporo��ilo/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_Sporo��ilo/_Novo sporo��ilo"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_Sporo��ilo/_Odgovori"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/_Sporo��ilo/Odgovor _na"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Sporo��ilo/Odgovor _na/_vsem"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Sporo��ilo/Odgovori _na/_po邸iljatelju"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Sporo��ilo/Odgovor _na/_dopisni seznam"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/Sporo��ilo/_Posreduj"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Sporo��ilo/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/_Sporo��ilo/Pre_usmeri"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_Sporo��ilo/Pres_tavi..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/_Sporo��ilo/_Kopiraj..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_Sporo��ilo/Z_bri邸i"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_Sporo��ilo/O_zna��i"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Sporo��ilo/O_zna��i/_Ozna��i"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Sporo��ilo/O_zna��i/O_dzna��i"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_Sporo��ilo/O_zna��i/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Sporo��ilo/O_zna��i/Ozna��i kot _neprebrano"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Sporo��ilo/O_zna��i/Ozna��i kot _prebrano"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Sporo��ilo/O_zna��i/Ozna��i _vsa kot prebrana"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/_Sporo��ilo/Znova ur_edi"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Orodja/Doda_j po邸iljatelja v adresar"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Orodja/_Filtriraj sporo��ila"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Orodja/_Filtriraj sporo��ila"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/S_amodejno"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po p_o邸iljatelju"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _naslovniku"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _zadevi"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Orodja/_Bri邸i podvojena sporo��ila"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_Orodja/_Izvr邸i"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/_Orodja/_Dnevni邸ko okno"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Prikrojitev"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Prikrojitev/_Splo邸ne nastavitve..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Prikrojitev/_Nastavitve _filtra..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_Prikrojitev/_Predloga..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_Prikrojitev/_Dejanja..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Prikrojitev/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Prikrojitev/_Nastavitve za trenutni _ra��un..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Prikrojitev/Naredi _nov ra��un..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Prikrojitev/_Uredi ra��une..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Prikrojitev/Spremeni _trenutni ra��un"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_Pomo��/_Priro��nik"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomo��/_Priro��nik/_Angle邸��ina"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomo��/_Priro��nik/_Japon邸��ina"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/_Pomo��/Pogosto _zastavljena vpra邸anja"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomo��/Pogosto _zastavljena vpra邸anja/_Angle邸��ina"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomo��/Pogosto _zastavljena vpra邸anja/_Nem邸��ina"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomo��/Pogosto _zastavljena vpra邸anja/��_pan邸��ina"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomo��/Pogosto _zastavljena vpra邸anja/_Franco邸��ina"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomo��/Pogosto _zastavljena vpra邸anja/_Italijan邸��ina"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_Pomo��/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Ustvarjam glavno okno...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Brez naslova"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "ni��"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Spreminjam tip lo��evanja oken z %d na %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Izprazni smetnjak"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Izbri邸em vsa sporo��ila v smetnjaku?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Dodaj po邸tni predal"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3175,16 +3183,16 @@ msgstr ""
 "��e je dolo��en obstoje��i po邸tni predal,\n"
 "bo pregledan samodejno."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Po邸tni predal `%s' 転e obstaja."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Po邸tni predal"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3193,144 +3201,144 @@ msgstr ""
 "Izdelava po邸tnega predala ni uspela.\n"
 "Morda obstajajo nekatere datoteke ali pa tam nimate dovoljenja za pisanje."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sy��pheed - ogled mape"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporo��ila"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor _za/_po邸iljatelja"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Poberi"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Pripoji novo po邸to"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Poberi vsa"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "Pripoji novo po邸to z vseh ra��unov"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Po邸lji ��akajo��a sporo��ila"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Sestavi"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Sestavi novo sporo��ilo"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Odgovori na sporo��ilo"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Posreduj"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Posreduj sporo��ilo"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Izbri邸i sporo��ilo"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Izvedi"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Izvedi ozna��en proces"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "Naslednje neprebrano sporo��ilo"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Nastavitve"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "Splo邸ne preference"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Ra��un"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Nastavitev ra��una"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Kon��aj"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Ali naj kon��am ta program?"
 
@@ -3452,28 +3460,28 @@ msgstr "Dose転en je konec sporo��ila. Naj nadaljujem z za��etka?"
 msgid "Search finished"
 msgstr "Iskanje kon��ano"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Ustvarjam videz sporo��ila...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Besedilo"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Priloge"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Tiskanje"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3482,7 +3490,7 @@ msgstr ""
 "Vnesite ukazno vrstico za tiskanje:\n"
 "(`%s' se bo nadomestil z imenom datoteke)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3926,7 +3934,7 @@ msgstr "Nalo転i vsa sporo��ila na stre転niku"
 msgid "Receive size limit"
 msgstr "Omejitev dol転ine pri sprejemanju"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr ""
 
@@ -3946,7 +3954,7 @@ msgstr "(Nefiltrirana sporo��ila bodo shranjena v tej mapi)"
 msgid "Authentication method"
 msgstr "Overovitvena metoda"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Samodejno"
 
@@ -3970,7 +3978,7 @@ msgstr "Generiran ID sporo��ila"
 msgid "Add user-defined header"
 msgstr "Dodaj uporabni邸ko definirano zaglavje"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Uredi... "
 
@@ -4442,30 +4450,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Poenostavljena kitaj邸��ina (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Poenostavljena kitaj邸��ina (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalna kitaj邸��ina (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalna kitaj邸��ina (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kitajski (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Tajski (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Tajski (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4474,129 +4487,129 @@ msgstr ""
 "��e je izbrano `Samodejno', bo uporabljeno\n"
 "optimalno kodiranje za trenutni locale."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Prelomi pred po邸iljanjem"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Lo��ilo podpisa"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Vrini samodejno"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Samodejni za転eni zunanji urejevalnik"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "Razveljavi nivo"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Prelom sporo��ila ob"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "znakov"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Prelom citata"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Prelomi ob vnosu"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Prelomi pred po邸iljanjem"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "Samodejno izberi ra��un za odgovore"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Citiraj sporo��ila ob odgovarjanju"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "Gumb Odgovori izvede odgovor na dopisni seznam"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Oblika odgovora"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Znak za citiranje"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Oblika posredovanja"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr "Opis simbolov"
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Pisava"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Prevedi ime zaglavja (kot `From:', `Subject:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Prika転i 邸tevilo neprebranih poleg imena mape"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skraj邸aj novi��arske skupine dalj邸e od"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "Izbri邸i"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Ogled povzetka"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prika転i naslovnika v stolpcu `Od', ��e ste po邸iljatelj vi"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Raz邸iri niti"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Oblika datuma"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr "Nastavi del za prikaz povzetka..."
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Omogo��i barvanje sporo��ila"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4604,329 +4617,329 @@ msgstr ""
 "Prika転i ve��zlo転no abecedo in 邸tevila kot\n"
 "znake ASCII (samo japon邸��ina)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Prika転i zaglavje nad ogledom sporo��ila"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Prika転i kratko zaglavje ob ogledu sporo��ila"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Prostor za vrstico"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "to��k(e)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Drsenje"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Polovica strani"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Nadzor gladkosti"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Spremeni velikost pripetim slikam"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Nastavitev prikaza zaglavja"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Samodejno preveri podpise"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Prika転i rezultat preverjanja podpisa v novem oknu"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Za��asno shrani prepustno frazo v pomnilnik"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Pote��e po"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "minut(e) "
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Nastavitev na '0' bo shranila prepustno frazo\n"
 " za celotno sejo)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Zagrabi vnos med vna邸anjem gesla"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prika転i opozorilo ob zagonu, ��e GnuPG ne deluje"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nobena datoteka s sporo��ilom ni izbrana."
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Odpri prvo neprebrano sporo��ilo ob vstopu v mapo"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "Ozna��i sporo��ilo kot prebrano samo, ko je odprto v novem oknu"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "Ob prejemu novih sporo��il pojdi v mapo Prejeto"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "IZvr邸i takoj, ko prestavlja邸 ali bri邸e邸 sporo��ilo"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Sporo��ila bodo ozna��ena do izvr邸itve,\n"
 "��e je to izklopljeno)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Dialog za sprejem"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Prika転i pogovorno okno za sprejem"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Vedno"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Nikoli"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "Ob napaki pri sprejemanju ne prika転i okna z napako"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Na koncu zapri pogovorno okno za sprejemanje"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " Nastavi povezave na tipke... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Zunanji ukazi (%s bo zamenjan z imenom datoteke / URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Spletni brskalnik"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "Ob dvojnem kliku dodaj naslov na cilj"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "Ob izhodu"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Potrdi ob izhodu"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "Izprazni smetnjak ob izhodu"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Vpra邸aj pred izpranjenjem"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Opozori, ��e so ��akajo��a sporo��ila"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "polno okraj邸ano ime dneva v tednu"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "polno ime dneva v tednu"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "okraj邸ano ime meseca"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "polno ime meseca"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "najustreznej邸a oblika datuma in ��asa za trenutni locale"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "邸tevilka stoletja (leto/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "dan v mesecu kot deseti邸ko 邸tevilo"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "ura kot deseti邸ko 邸tevilo s 24-urnim prikazom"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "ura kot destei邸ko 邸tevilo z 12-urnim prikazom"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "dan v letu kot deseti邸ko 邸tevilo"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "mesec kot deseti邸ko 邸tevilo"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "minute kot deseti邸ko 邸tevilo"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "AM oz. PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "sekunde kot deseti邸ko 邸tevilo"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "dan v tednu kot deseti邸ko 邸tevilo"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "najustreznej邸i datum za trenutni locale"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "zadnji dve 邸tevki leta"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "leto kot deseti邸ko 邸tevilo"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "��asovni pas ali ime ali okraj邸ava"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Dolo��evalec"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "Primer"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Nastavi barve sporo��ila"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Barve"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Citirano besedilo - prvi nivo"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Citirano besedilo - drugi nivo"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Citirano besedilo - tretji nivo"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "povezava URI"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Obnovi barve za citiranje"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "Izberite barvo za citiranje na prvem nivoju"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "Izberite barvo za citiranje na drugem nivoju"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "Izberite barvo za citiranje na tretjem nivoju"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "Izberite barvo za URI"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Opis simbolov"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4950,11 +4963,11 @@ msgstr ""
 "Novi��arske skupine\n"
 "ID sporo��ila"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "��e je x nastavljen, prika転i expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4968,7 +4981,7 @@ msgstr ""
 "Telo citiranega sporo��ila brez podpisa\n"
 "Dobesedno %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4980,15 +4993,15 @@ msgstr ""
 "Dobesedni zaviti oklepaj\n"
 "Dobesedni zaviti zaklepaj"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Izbira pisave"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Povezave na tipke"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4998,11 +5011,11 @@ msgstr ""
 "Lahko tudi spremenite bli転njice do vsakega menija, ��epritisnete katerokoli "
 "tipko, ko na kos ka転e mi邸kin kazalec"
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "Privzeto"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Stari Sylpheed"
 
@@ -5070,213 +5083,208 @@ msgstr "Nastavitev filtra"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Ali res 転elite izbrisati to pravilo?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Brez naslova"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Izbri邸i pravilo"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "Izbri邸i pravilo"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "Skrita zaglavja"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "Zaglavje"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "Sporo��ila"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "vsebuje"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "ne vsebuje"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "Premakni navzdol"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/Prepi邸_i..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Ne sprejmi"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "Izbri邸i mapo"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "Opombe"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "Nastavi barve sporo��ila"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Oznaka/Ozna��i kot _prebrano"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/Pre_usmeri"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "Izvedi"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "Mapa"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "Naslov"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "Zaglavje"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "Zaglavje"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "Zaglavje"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Naslovnik ni dolo��en."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Cilj ni nastavljen."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: datoteka ne obstaja\n"
@@ -5533,57 +5541,57 @@ msgstr "Povezovanje"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Povezujem se s stre転nikom SMTP: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "Po邸iljam HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "Overovljam"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 #, fuzzy
 msgid "Sending message..."
 msgstr "Po邸iljam sporo��ilo"
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "Po邸iljam EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "Po邸iljam MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "Po邸iljanje"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "Po邸iljam RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "Po邸iljam DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Zapu邸��am..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Po邸iljam sporo��ilo (%d / %d zlogov)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "Po邸iljam sporo��ilo"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "Med po邸iljanjem sporo��ila je pri邸lo do napake."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5890,121 +5898,121 @@ msgstr "Ne."
 msgid "Creating summary view...\n"
 msgstr "Delam ogled povzetka...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Oznaka procesa"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Nekaj oznak je ostalo. Naj obdelam?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Preiskujem mapo (%s) ..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Ni ve�� neprebranih sporo��il"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Nobeno neprebrano sporo��ilo ni bilo najdeno. Naj i邸��em s konca?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "Ni neprebranih sporo��il."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nobeno neprebrano sporo��ilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "Ponovno iskanje"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "Ni ve�� neprebranih sporo��il"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Nobeno novo sporo��ilo ni bilo najdeno. Naj i邸��em s konca?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "Ni novih sporo��il."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "Nobeno novo sporo��ilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Ni ve�� ozna��enih sporo��il"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "Nobeno ozna��eno sporo��ilo ni bilo najdeno. Naj i邸��em s konca?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "Ni ozna��enih sporo��il."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nobeno ozna��eno sporo��ilo ni bilo najdeno. Naj i邸��em od za��etka?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Ni ve�� sporo��il z oznako"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Nobeno sporo��ilo z oznako ni bilo najdeno. Naj i邸��em s konca?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "Ni sporo��il z oznako"
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nobeno sporo��ilo z oznako ni bilo najdeno. Naj i邸��em od za��etka?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Privla��im sporo��ila po zadevi..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d izbrisanih"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d prestavljenih"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d presnetih"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " izbranih kosov"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d neprebranih, skupaj %d (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d neprebranih, skupaj %d"
@@ -6176,6 +6184,9 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "pisanje v %s ni uspelo.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Ponovno gradim vsa drevesa map..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_Pogled/Nabor zna_kov/---"
 
diff --git a/po/sr.po b/po/sr.po
index 4013073d..a2403451 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -64,11 +64,11 @@ msgstr ""
 "niste, pi邸ite ne Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, SAD."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "��itanje konfiguracije za svaki nalog...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -76,19 +76,19 @@ msgstr ""
 "Neki prozori za pisanje pisma su otvoreni.\n"
 "Molim, zatvorite sve prozore pre izmena naloga."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Otvaranje prozora za izmenu naloga...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Stvaranje prozora za izmenu naloga...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Izmeni naloge"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -96,8 +96,8 @@ msgstr ""
 "Nove poruke biti ��e proveravane ovim redom. Ozna��ite pod\n"
 "`G' one naloge sa kojih 転elite skinuti e-po邸tu sa `Primi sve'."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -105,60 +105,66 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Izmeni"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " Obri邸i "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Dole"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Gore"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr "Postavi kao uobi��ajeni nalog "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "貼elite li zaista obrisati ovaj nalog?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Neimenovano"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Obri邸i nalog"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "貼elite li zaista obrisati ovaj nalog?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Da"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Ne"
 
@@ -227,7 +233,7 @@ msgstr " Po邸alji"
 msgid "Abort"
 msgstr "Odustani"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -237,11 +243,11 @@ msgstr ""
 "Unesite naredbu za 邸tampanje:\n"
 "(`%s' predstavlja datoteku)"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -251,7 +257,7 @@ msgstr ""
 "Unesite naredbu za 邸tampanje:\n"
 "(`%s' predstavlja datoteku)"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr ""
 
@@ -259,7 +265,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
@@ -345,8 +351,8 @@ msgstr "/_Adresa/_Izmeni"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_bri邸i"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/_Alati"
 
@@ -354,13 +360,13 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/_Pomo��"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/_Pomo��/_O"
 
@@ -377,10 +383,10 @@ msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -399,17 +405,17 @@ msgstr "/_Obri邸i"
 msgid "E-Mail address"
 msgstr "Adresa e-po邸te"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Adresar"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -572,7 +578,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Direktorijum"
 
@@ -596,7 +602,7 @@ msgstr "Uobi��ajene adrese"
 msgid "Personal address"
 msgstr "Li��ne adrese"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Obave邸tenje"
 
@@ -604,7 +610,7 @@ msgstr "Obave邸tenje"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Gre邸ka"
 
@@ -616,31 +622,31 @@ msgstr "Stvaram dijalog za prozor sa upozorenjem...\n"
 msgid "Show this message next time"
 msgstr "Prika転i ovu poruku slede��i put"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Narand転asta"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "Crvena"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Roze"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Nebesko plava"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Plava"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Zelena"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Sme��a"
 
@@ -648,7 +654,7 @@ msgstr "Sme��a"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Ni邸ta"
 
@@ -660,8 +666,8 @@ msgstr "/_Dodaj..."
 msgid "/_Remove"
 msgstr "/_Skloni"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
@@ -827,8 +833,8 @@ msgstr "/_Pregled/_Odgovori"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
@@ -855,7 +861,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -938,140 +944,145 @@ msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_��ablon"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/_Alati/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Izmeni/Izmeni sa neza_visnim editorom"
 
-#: src/compose.c:674
+#: src/compose.c:676
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:675
+#: src/compose.c:677
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti deo teksta\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Gre邸ka u formatu citata."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Gre邸ka u poruci odgovori/prosledi."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veli��inu datoteke %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne mogu pro��itati %s."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz vi邸e delova."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [Izmenjeno]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Pisanje poruke%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Po邸alji"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1079,27 +1090,27 @@ msgstr ""
 "Nalog za slanje po邸te nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Do邸lo je do gre邸ke prilikom slanja poruke %s -u."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sa��uvati poruku u direktorijumu poslato."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Ne mogu prona��i nijedan klju�� kome je trenutno dodeljen id klju��a `%s'."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1108,141 +1119,141 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak po邸aljem?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "ne mogu upisati zaglavlje\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "ne mogu da prona��em direktorijum odlo転eno\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "ne mogu odlo転iti poruku\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Veli��ina"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Po邸alji poruku"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Po邸alji kasnije"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "Odlo転i u direktotijum odlo転eno i po邸alji kasnije"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Nedovr邸eno"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Sa��uvaj u direktorijum nedovr邸eno"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Prika��i"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Prika��i datoteku"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Unesi potpis"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Editor"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Izmeni sa nezavisnim ediorom"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Sa転imanje"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Sa転mi sve duge linije"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Pogre邸an MIME tip"
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogre邸na: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1253,72 +1264,72 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Prekinuta grupa procesa: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Privremena datoteka: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Napi邸i: unos iz procesa pra��enja\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Ne mogu pokrenuti nezavisni editor\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Ne mogu snimiti u datoteku\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "��itanje pipe-a nije uspelo\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Ne mogu odlo転iti poruku."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Odbaci poruku"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Odbaci"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "u Nedovr邸eno"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "貼elite li primeniti 邸ablon `%s'?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Primeni 邸ablon"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Zameni"
 
@@ -1479,12 +1490,12 @@ msgstr "Izmeni direktorijum"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -1653,163 +1664,159 @@ msgstr "neuspeh pri pisanju konfiguracije u datoteku\n"
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Sandu��e"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Poslato"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Odlo転eno"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Sme��e"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Nedovr邸eno"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "NoviDir"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne mo転e biti uvr邸ten u ime direktorijuma."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' ve�� postoji."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu napraviti direktorijum `%s'."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi direktorijum..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj direktorijum..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/_Obri邸i direktorijum"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Isprazni sme��e"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/_Proveri ima li novih poruka"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/Osv_e転i stablo direktorijuma"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/_Tra転i poruke..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepro��itanih poruka."
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prijavi se na _news grupu..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/Skloni news _grupu"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Stvaram pregled za direktorijum...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Nepro��itano"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Postavljam info direktorijuma...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretra転ujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretra転ujem direktorijum %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "/O_sve転i stablo direktorijuma"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Osve転avam stablo direktorijuma..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osve転avam stablo direktorijuma..."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Osve転avam sva stabla direktorijuma..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Proveravanje novih poruka u svim direktorijumima..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Direktorijum %s je odabran\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "��aljem poruku"
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Do邸lo je do gre邸ke prilikom slanja poruke %s -u."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1819,16 +1826,16 @@ msgstr ""
 "(ukoliko 転elite napraviti direktorijum za sme邸tanje poddirektorijuma,\n"
 "dodajte `/' na kraj imena)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Preimenuj direktorijum"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1837,24 +1844,24 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' bi��e obrisane.\n"
 "貼elite li ih zaista obrisati?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Obri邸i direktorijum"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "Isprazni sme��e"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "Isprazniti sve poruke iz sme��a?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1863,34 +1870,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NE��E biti obrisane sa diska)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandu��e"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Obri邸i IMAP4 nalog"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Obri邸i news grupu"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Obri邸i news nalog"
 
@@ -1938,7 +1945,7 @@ msgstr "nepoznato"
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne mogu prona��i listu news grupa."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Gotovo."
 
@@ -2226,7 +2233,7 @@ msgstr "Unesi LDIF datoteku u Adresar"
 msgid "Prev"
 msgstr "Preth."
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "Sled."
 
@@ -2317,7 +2324,7 @@ msgstr "Povezujem se na POP3 server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 server: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
@@ -2347,7 +2354,7 @@ msgstr "Preuzimam veli��inu poruka (LIST)..."
 msgid "Deleting message %d"
 msgstr "Bri邸em poruke %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Izlazim"
 
@@ -2389,7 +2396,8 @@ msgstr "Ne mogu pisati u datoteku."
 msgid "Socket error."
 msgstr "Protokol gre邸ka."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2404,19 +2412,19 @@ msgid ""
 "%s"
 msgstr "Sandu��e je zaklju��ano."
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Na��in provere identieta"
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Na��in provere identieta"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr ""
 
@@ -2839,329 +2847,329 @@ msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Iz_vor poruke"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_Pregled/Prika転i kompletno _zaglavlje"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Osve転i rezime"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 #, fuzzy
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Poruka/Prekini pri_manje"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/_Poruka/Po邸alji _odlo転ene poruke"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_Poruka/Sastavi _novu poruku"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_Poruka/O_dgovor"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Poruka/Odgovori/svim_a"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Poruka/Odgovori/po邸il_jaocu"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Poruka/Odgovori/li_sti"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/_Poruka/_Prosledi"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Poruka/P_rosledi kao spajalicu"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/_Poruka/Preus_meri"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_Poruka/Preme邸tanje..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/_Poruka/_Kopiranje..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_Poruka/Brisanje..."
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_Poruka/Ozna��i"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Poruka/O_zna��i/_Ozna��i"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Poruka/O_zna��i/_Ukloni oznaku"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_Poruka/O_zna��i/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Poruka/O_zna��i/Ozna��i kao _nepro��itano"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Poruka/O_zna��i/Ozna��i kao _pro��itano"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Poruka/O_zna��i/Ozna��i sve _pro��itano"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Alati/Dodaj po邸iljaoca u adresar"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Alati/_Napravi pravilo za filtriranje"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/_Automatski"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Od"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Za"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _temi"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Alati/_Obri邸i duple poruke"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/_Alati/_Izvr邸i"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/_Alati/Proyor za logove"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_obi��ajene postavke..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_��ablon..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Akcije..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni nalog..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Napravi _nov nalog..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Izmeni naloge..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promeni _trenutni nalog"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_Pomo��/_Priru��nik"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomo��/_Priru��nik/_Engleski"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomo��/_Priru��nik/_Japanski"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/_Pomo��/_FAQ"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomo��/_FAQ/_Engleski"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomo��/_FAQ/_Nema��ki"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomo��/_FAQ/_��panski"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomo��/_FAQ/_Francuski"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomo��/_FAQ/_Italijanski"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_Pomo��/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Kreiranje glavnih prozora...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "ni邸ta"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Menjanje vrste podele prozora iz %d u %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni sme��e"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "Isprazniti sve poruke iz sme��a?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Dodaj sandu��e"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3171,16 +3179,16 @@ msgstr ""
 "Ako je une邸en postoje��e sandu��e, automatski\n"
 "��e biti pretra転en."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandu��e`%s' ve�� postoji."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Sandu��e"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3189,144 +3197,144 @@ msgstr ""
 "Kreiranje sandu��eta nije uspelo.\n"
 "Mo転da neke datoteke ve�� postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Direktorijumi"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Od_govor"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dgovori/_po邸iljaocu"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Primi"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Prima novu po邸tu"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Primi sve"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "Prima novu po邸tu sa svih naloga"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "��alje odlo転ene poruku/e"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Napi邸i"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Napi邸i novu poruku"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Odgovori"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Odgovari na poruku"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "Odgovori na sve"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Prosledi"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Prosle��uje poruku"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Obri邸i poruku"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Izvr邸i"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "Izvr邸i ozna��ene procese"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "Slede��a nepro��itana poruka"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Svojstva"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "Uobi��ajena svojstva"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Nalog"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Pode邸avanja naloga"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
@@ -3448,28 +3456,28 @@ msgstr "Kraj liste dosegnut; nastaviti od po��etka?"
 msgid "Search finished"
 msgstr "Pretraga zavr邸ena"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Pravljenje pregleda poruka...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Tekst"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Dodatak"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sa��uvati datoteku `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "��tampaj"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3478,7 +3486,7 @@ msgstr ""
 "Unesite naredbu za 邸tampanje:\n"
 "(`%s' predstavlja datoteku)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3922,7 +3930,7 @@ msgstr "Preuzmi sve poruke sa servera"
 msgid "Receive size limit"
 msgstr "Ograni��enje u veli��ini za primanje"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr ""
 
@@ -3942,7 +3950,7 @@ msgstr "(Nefiltrirane poruke biti ��e stavljene u ovaj direktorijum)"
 msgid "Authentication method"
 msgstr "Na��in provere identieta"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Automatski"
 
@@ -3966,7 +3974,7 @@ msgstr "Generi邸i ID poruke"
 msgid "Add user-defined header"
 msgstr "Dodaj zaglavlje korisnika"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " Izmeni... "
 
@@ -4438,30 +4446,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Pojednostavljeni Kineski (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalni Kineski (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalni Kineski (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kineski (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4470,458 +4483,458 @@ msgstr ""
 "Ako je `Automatski' odabrano, optimalni charset\n"
 "za locale ��e biti kori邸��en."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 #, fuzzy
 msgid "Transfer encoding"
 msgstr "Sa転mi pre slanja"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Odvaja potpis"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Ubaci automatski"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Automatski pokreni spolja邸nji editor"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "Undo nivo"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Sa転mi poruke na"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "znakova"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Sa転mi citat"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Sa転mi pri unosu"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Sa転mi pre slanja"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "Automatski odaberi nalog za odgovore"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Citiraj poruku pri odgovaranju"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "Taster za odgovor povla��i odgovor za listu"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Format odgovora"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Oznaka citata"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Format prose��ivanja"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Obja邸njenje simbola "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Font"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Prevedi ime zaglavlja (kao 邸to su `Od:' i `Tema:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Prika転i broj nepro��itanih poruka pored imena direktorijuma"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrati news grupe du転e od"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "slova"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Pregled odr転avanja"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prika転i primaoca na `Od' ukoliko ste Vi autor"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Ra邸iri stablo"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Format datuma"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " Postavljanje pojedinosti prikaza... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Omogu��i poruke u boji"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Prika転i 2-byte abecedu i brojeve sa 1-byte znakovima"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Prika転i zaglavlje iznad poruke"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Prika転i kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Razmak linija"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "pixel(a)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Pola stranice"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Miran scroll"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Prikaz pode邸avanje zaglavlja"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Automatski proveri potpis"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Prika転i potpis u popup prozoru"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Smesti lozinku privremeno u memoriju"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Isti��e posle"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "minut(a)"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Postavljanje na '0' ��e smestiti loyinku\n"
 "u toku cele sesije)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Uhvati unos pri upisivanju lozinke"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prika転i upozorenje na startu ako GnuPG ne radi"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nijedna datoteka poruke nije odabrana."
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Otvori prvu nepro��itanu poruku pri ulasku u direktorijum"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "Samo ozna��i poruke kao pro��itane pri otvaranju novog prozora"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "Idi u sandu��e posle primanja po邸te"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Izvr邸i odmah pri preme邸tanju ili brisanju poruka"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Poruke ��e samo biti ozna��ene do izvr邸enja\n"
 " ako je ovo isklju��eno)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Prika転i dijalog primanja"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Prika転i dijalog primanja"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Uvek"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Nikada"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne izbacuj prozor sa porukom o gre邸ci u primanju"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "Zatvori dijalog primanja kada se zavr邸i"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " Pode邸avanje pre��ica na tastaturi..."
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Spolja邸nje naredbe (%s ��e biti zamenjeno imenom datoteke / URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Web ��ita��"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "Dodaj adresu u odredi邸te kada se dva put klikne"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "Na izlazu"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Potvrdi izlaz"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "Isprazni sme��e pri izlazu"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Pitaj pre pra転njenja"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Upozori ako ima odlo転enih poruka"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "pojednostavljeno ime dana u nedelji"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "puno ime dana u nedelji"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "skra��eno ime meseca"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "puno ime meseca"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "転eljeni datum i vreme za trenutni locale"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "broj veka (godina/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "dan u mesecu kao decimalni broj"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "sat kao decimalni broj koriste��i 24 satno vreme"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "sat kao decimalni broj koriste��i 12 satno vreme"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "dan u godini kao decimalni broj"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "mesec kao decimalni broj"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "minuti kao decimalni broj"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "AM ili PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "sekunde kao decimalni broj"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "dan u nedelji kao decimalni broj"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "転eljeni datum za trenutni locale"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "posljednje dve cifre godine"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "godina kao decimalni broj"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "vremenska zona ili ime ili skra��enica"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Specifier"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "Primer"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Podesi boje poruka"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Boje"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst - prvi nivo"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst - drugi nivo"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst - tre��i nivo"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Cikli��no menjaj boje citata"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "Odaberite boju za citat 1. stepena"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "Odaberite boju za citat 2. stepena"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "Odaberite boju za citat 3. tepena"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "Odaberite boju za URI"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Obaj邸njenje znakova"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4945,11 +4958,11 @@ msgstr ""
 "News grupe\n"
 "ID poruke"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Ako je x odabrano, prikazuje expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4963,7 +4976,7 @@ msgstr ""
 "Citirano telo poruke sa potpisom\n"
 "Literal %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4975,15 +4988,15 @@ msgstr ""
 "Literal po��etna zagrada\n"
 "Literal zavr邸na zagrada"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Izbor fonta"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Pre��ice sa tastature"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4993,11 +5006,11 @@ msgstr ""
 "Tako��e mo転ete menjati pre��ice svakog menija pritiskom na\n"
 "bilo koji taster kada postavite kursor mi邸a na pojedinu stvar."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "Uobi��ajeno"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Stari Sylpheed"
 
@@ -5065,213 +5078,208 @@ msgstr "Pode邸avanje filtera"
 msgid "Enabled"
 msgstr ""
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Zaista obrisati pravilo?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Neimenovano"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Obri邸i pravilo"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 #, fuzzy
 msgid "Filter rule"
 msgstr "Obri邸i pravilo"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr ""
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr ""
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr ""
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 #, fuzzy
 msgid "Any header"
 msgstr "Svo zaglavlje"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 #, fuzzy
 msgid "Edit header..."
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 #, fuzzy
 msgid "Message body"
 msgstr "Poruka"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr ""
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "sadr転i"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 #, fuzzy
 msgid "doesn't contain"
 msgstr "ne sadr転i"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr ""
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr ""
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr ""
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr ""
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 #, fuzzy
 msgid "Move to"
 msgstr "Pomeri dole"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 #, fuzzy
 msgid "Copy to"
 msgstr "/_Kopiranje..."
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Ne primaj"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 #, fuzzy
 msgid "Delete from server"
 msgstr "Obri邸i direktorijum"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 #, fuzzy
 msgid "Set mark"
 msgstr "Bele邸ke"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 #, fuzzy
 msgid "Set color"
 msgstr "Podesi boje poruka"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 #, fuzzy
 msgid "Mark as read"
 msgstr "/_Ozna��i/Ozna��i kao _pro��itano"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 #, fuzzy
 msgid "Forward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 #, fuzzy
 msgid "Redirect"
 msgstr "/Pre_usmeri"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 #, fuzzy
 msgid "Execute command"
 msgstr "Izvr邸i"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr ""
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 #, fuzzy
 msgid "folder:"
 msgstr "Direktorijum"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 #, fuzzy
 msgid "address:"
 msgstr "Adresa"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 #, fuzzy
 msgid "Edit header list"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 #, fuzzy
 msgid "Headers"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 #, fuzzy
 msgid "Header:"
 msgstr "Zaglavlje"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 #, fuzzy
 msgid "Command is not specified."
 msgstr "Linija za neredbe nije pode邸ena."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 #, fuzzy
 msgid "Destination folder is not specified."
 msgstr "Odredi邸te nije postavljeno."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Linija za neredbe nije pode邸ena."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: datoteka ne postoji\n"
@@ -5528,60 +5536,60 @@ msgstr "Povezujem se"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Spajam se na SMTP server: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "��aljem MAIL FROM..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 #, fuzzy
 msgid "Authenticating"
 msgstr "Provera identiteta"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 #, fuzzy
 msgid "Sending message..."
 msgstr "��aljem poruku"
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "��aljem MAIL FROM..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "��aljem MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "��aljem"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "��aljem RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "��aljem DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Zavr邸avnje..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "��aljem poruku (%d / %d bajtova)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "��aljem poruku"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "Do邸lo je do gre邸ke prilikom slanja poruke."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5888,120 +5896,120 @@ msgstr "Ne."
 msgid "Creating summary view...\n"
 msgstr "Stvaranje pregleda odr転avanja...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Izvr邸i oznaku"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Neke oznake su izostavljene. Izvr邸iti ih?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Pregledanje direktorijuma (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Nema nepro��itanih poruka"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Nema vi邸e nepro��itanih poruka. Tra転iti od kraja?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "Nema nepro��itanih poruka."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "Nema vi邸e nepro��itanih poruka. Pre��i u slede��i direktorijum?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "Pretra転i ponovo"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "Nema vi邸e novih poruka"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Nema vi邸e novih poruka. Tra転iti od kraja?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "Nema novih poruka."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "Nema vi邸e novih poruka. Pre��i u slede��i direktorijum?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Nema vi邸e ozna��enih poruka"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "Nema vi邸e ozna��enih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "Nema ozna��enih poruka."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema ozna��enih poruka. Tra転iti od po��etka?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Nema vi邸e obele転enih poruka"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema vi邸e obele転enih poruka. Tra転iti od kraja?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "Nema obele転enih poruka."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema vi邸e obele転enih poruka. Krenuti od po��etka?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Prihvatanje poruka po temi..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d preme邸teno"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepro��itanih, %d ukupno (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepro��itanih, %d ukupno"
@@ -6173,6 +6181,9 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "pisanje u %s nije uspelo.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Osve転avam sva stabla direktorijuma..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_Pregled/_Znakovni standard/---"
 
diff --git a/po/sv.po b/po/sv.po
index e7af4d1d..b548d92f 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Mattias Ostergren <spikboll@gmx.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -65,11 +65,11 @@ msgstr ""
 "program. Om inte, skriv till Free Software Foundation, Inc., 59 Temple Place "
 "- Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "L辰ser all konfiguration f旦r varje konto...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -77,19 +77,19 @@ msgstr ""
 "N奪gra skrivf旦nster 辰r 旦ppna.\n"
 "St辰ng alla skrivf旦nster innan du redigerar kontona."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "��ppnar kontoredigeringsf旦nstret...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Skapar kontoredigeringsf旦nster...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Redigera konton"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -98,8 +98,8 @@ msgstr ""
 "Markera rutorna i `G'-kolumnen f旦r att aktivera meddelandeh辰mtning\n"
 "via \"H辰mta alla\""
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -107,60 +107,66 @@ msgstr ""
 msgid "Name"
 msgstr "Namn"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Server"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "L辰gg till"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "Redigera"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " Ta bort "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "Ner"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Upp"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " Anv辰nd som f旦rvalt konto "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Vill du verkligen ta bort detta konto?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Namnl旦s"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Ta bort konto"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "Vill du verkligen ta bort detta konto?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Ja"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Nej"
 
@@ -229,7 +235,7 @@ msgstr " Skicka "
 msgid "Abort"
 msgstr "Avbryt"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -240,11 +246,11 @@ msgstr ""
 "(\"%%h\" kommer att ers辰ttas med argumentet)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "��tg辰rdens dolda anv辰ndarargument"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -255,7 +261,7 @@ msgstr ""
 "(\"%%u\" kommer att ers辰ttas med argumentet)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "��tg辰rdens anv辰ndarargument"
 
@@ -263,7 +269,7 @@ msgstr "��tg辰rdens anv辰ndarargument"
 msgid "Add Address to Book"
 msgstr "L辰gg till i adressbok"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adress"
@@ -349,8 +355,8 @@ msgstr "/A_dress/_Redigera"
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/V_erktyg"
 
@@ -358,13 +364,13 @@ msgstr "/V_erktyg"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/_Hj辰lp"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/_Hj辰lp/_Om"
 
@@ -381,10 +387,10 @@ msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -403,17 +409,17 @@ msgstr "/_Ta bort"
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "Namn:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -578,7 +584,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Mapp"
 
@@ -602,7 +608,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Notera"
 
@@ -610,7 +616,7 @@ msgstr "Notera"
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Fel"
 
@@ -622,31 +628,31 @@ msgstr "Skapar dialog f旦r meddelandepanel...\n"
 msgid "Show this message next time"
 msgstr "Visa detta meddelande n辰sta g奪ng"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Orange"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "R旦d"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Rosa"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "Himmelsbl奪"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Bl奪"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Gr旦n"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Brun"
 
@@ -654,7 +660,7 @@ msgstr "Brun"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Ingen"
 
@@ -666,8 +672,8 @@ msgstr "/_L辰gg till..."
 msgid "/_Remove"
 msgstr "/_Ta bort"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/_Egenskaper..."
 
@@ -827,8 +833,8 @@ msgstr "/_Visa/_Svara till"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_Visa/---"
 
@@ -855,7 +861,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -938,137 +944,142 @@ msgstr "/_Visa/_Kodning/F旦renklad kinesisk (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_Visa/_Kodning/F旦renklad kinesisk (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visa/_Kodning/Traditionell kinesisk (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visa/_Kodning/Traditionell kinesisk (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visa/_Kodning/Koreansk (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visa/_Kodning/Thai (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visa/_Kodning/Thai (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/V_erktyg/_Adressbok"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/V_erktyg/_��tg辰rder"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/V_erktyg/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/V_erktyg/Redigera med e_xtern redigerare"
 
-#: src/compose.c:674
+#: src/compose.c:676
 msgid "/_Tools/PGP Si_gn"
 msgstr "/V_erktyg/_Signera"
 
-#: src/compose.c:675
+#: src/compose.c:677
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/V_erktyg/_Kryptera"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Kan inte l辰sa textdel\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte l辰sa filstorlek p奪 %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s 辰r tom."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte l辰sa %s"
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte l辰sa delen av multipart-meddelandet."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [Redigerat]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Skriv meddelande%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "Skriv meddelande%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Mottagare 辰r inte angiven."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "Skicka"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "��mnesraden 辰r tom. Skicka 辰nd奪?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "kan inte l辰sa mottagarlista"
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1076,27 +1087,27 @@ msgstr ""
 "Konto f旦r att skicka post 辰r inte specificerat.\n"
 "V辰lj ett e-postkonto innan du skickar."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod n辰r meddelandet skulle skickas till %s."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i k旦-mappen."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Kunde inte hitta n奪gon nyckel associerad med nu aktiva nyckel-ID \"%s\"."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "kan inte 辰ndra filr辰ttigheter\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1106,140 +1117,140 @@ msgstr ""
 "%s till %s.\n"
 "Skicka 辰nd奪?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "kan inte skriva brevhuvud\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "l辰gger meddelandet i k旦...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta k旦mapp\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "kan inte l辰gga meddelandet i k旦\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivf旦nster...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Fr奪n:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "Placera i k旦mapp och skicka senare"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Utkast"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "Infoga"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Infoga fil"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Bifoga"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Bifoga fil"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "Infoga signatur"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "Redigerare"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Redigera med extern redigerare"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Radbrytning"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "Radbryt l奪nga rader"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller 辰r tom."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "S旦kv辰g"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad f旦r extern redigerare: \"%s\"\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1250,72 +1261,72 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Avslutade processgrupps-id: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Tempor辰r fil: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "Skriv: indata fr奪n bevakad process\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Kunde inte k旦ra extern redigerare\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Kunde inte skriva till fil\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Kunde inte l辰sa fr奪n r旦r\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "Kan inte l辰gga meddelandet i k旦."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "V辰lj fil"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "V辰lj fil"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "Kasta meddelande"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Detta meddelande har 辰ndrats. Kasta det?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Kasta"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "till Utkast"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du anv辰nda mallen \"%s\" ?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "Anv辰nd mall"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "Ers辰tt"
 
@@ -1476,12 +1487,12 @@ msgstr "Redigera mapp"
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet p奪 mappen:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet p奪 den nya mappen:"
 
@@ -1650,160 +1661,156 @@ msgstr "misslyckades skriva konfiguration till fil\n"
 msgid "Select folder"
 msgstr "V辰lj mapp"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "Skickat"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "K旦"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "NyMapp"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" f奪r inte finnas i mappnamn."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen \"%s\" finns redan."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan inte skapa mappen \"%s\"."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/_Ny mapp..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/_Byt namn..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/_Ta bort"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 msgid "/Empty _trash"
 msgstr "/T旦m _papperskorgen"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/Ta emot nya _meddelanden"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/_Uppdatera mapptr辰d"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/_S旦k meddelanden..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 msgid "/Down_load"
 msgstr "/_H辰mta"
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prenumerera p奪 _diskussionsgrupp"
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/T_a bort diskussionsgrupp"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Skapar mappvy...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Nya"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Ol辰sta"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "St辰ller in mappinfo...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "St辰ller in mappinfo..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "S旦ker igenom mapp %s%c%s..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "S旦ker igenom mapp %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mapptr辰d"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Mapptr辰det kommer att uppdateras. Forts辰tt?"
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mapptr辰d..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uppdatering av mapptr辰det misslyckades."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "Uppdaterar alla mapptr辰d..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelanden i alla mappar..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappen %s 辰r vald\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ett fel uppstod vid nedladdning av meddelanden i \"%s\"."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1813,16 +1820,16 @@ msgstr ""
 "(om du vill skapa en mapp som skall inneh奪lla undermappar,\n"
 " l辰gg till \"/\" vid slutet av namnet)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Skriv in nytt namn p奪 \"%s\":"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Byt namn p奪 mapp"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1831,24 +1838,24 @@ msgstr ""
 "Alla mappar och meddelanden under \"%s\" kommer att tas bort.\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "T旦m papperskorgen"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "T旦m alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1857,34 +1864,34 @@ msgstr ""
 "Vill du verkligen ta bort brevl奪dan \"%s\" ?\n"
 "(Meddelandena tas INTE bort fr奪n disken)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Ta bort brevl奪da"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
@@ -1932,7 +1939,7 @@ msgstr "ok辰nd"
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan inte h辰mta grupplista."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "F辰rdig."
 
@@ -2215,7 +2222,7 @@ msgstr "Importera LDIF-fil till adressboken"
 msgid "Prev"
 msgstr "F旦reg奪ende"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "N辰sta"
 
@@ -2305,7 +2312,7 @@ msgstr "Ansluter till POP3-server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
@@ -2335,7 +2342,7 @@ msgstr "Tar emot meddelandenas storlek (LIST)..."
 msgid "Deleting message %d"
 msgstr "Tar bort meddelande %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "Avslutar"
 
@@ -2378,7 +2385,8 @@ msgstr "Kan inte skriva fil."
 msgid "Socket error."
 msgstr "Fel p奪 uttag (socket)."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "Anslutningen st辰ngdes av fj辰rrv辰rden."
 
@@ -2395,11 +2403,11 @@ msgstr ""
 "Brevl奪dan 辰r l奪st:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2408,7 +2416,7 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr "Sessionens v辰ntetid tog slut."
 
@@ -2821,320 +2829,320 @@ msgstr "/_Visa/_Kodning/Japansk (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visa/_Kodning/Japansk (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visa/_Kodning/Kinesisk (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visa/_Kodning/Koreansk (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_Visa/_��ppna i nytt f旦nster"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_Visa/_Meddelandek辰llkod"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_Visa/_Hela brevhuvudet"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/_Meddelande"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelande/Mott_ag"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelande/Mottag/H辰mta fr奪n _detta konto"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelande/Mottag/H辰mta fr奪n alla _konton"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Meddelande/Mottag/Avbryt h辰mtnin_g"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelande/Mottag/---"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelande/Skicka _k旦ade meddelanden"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/_Meddelande/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelande/Skriv _nytt meddelande"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/_Meddelande/Sva_ra"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelande/_Svara till"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelande/_Svara till/a_lla"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelande/_Svara till/_avs辰ndaren"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelande/_Svara till/_e-postlista"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/_Meddelande/Vi_darebefordra"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelande/Vidarebefordra som bil_aga"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelande/_Omdirigera"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelande/Fl_ytta..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelande/_Kopiera"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/_Meddelande/_Ta bort"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/_Meddelande/_Markera"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelande/_Markera/_Markera"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelande/_Markera/_Avmarkera"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelande/_Markera/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelande/_Markera/Markera som _ol辰st"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelande/_Markera/Markera som _l辰st"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelande/_Markera/Markera alla som l_辰sta"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelande/Redigera _om"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/V_erktyg/L辰gg till avs辰ndaren i adressbo_ken"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 msgid "/_Tools/Filter _selected messages"
 msgstr "/V_erktyg/Filtrera _valda meddelanden"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/V_erktyg/_Skapa filterregel"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/V_erktyg/_Skapa filterregel/_Automatiskt"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Fr奪n"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Till"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/V_erktyg/_Skapa filterregel/genom _��mne"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/V_erktyg/Ta bort meddelande_dubbletter"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/V_erktyg/Utf旦r _k旦ade 奪tg辰rder"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/V_erktyg/_Loggf旦nster"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Konfiguration"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguration/_Allm辰nna inst辰llningar..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguration/_Filterinst辰llningar..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguration/_Mall..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguration/_��tg辰rder..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Konfiguration/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguration/_Inst辰llningar f旦r aktuellt konto..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguration/Skapa _nytt konto..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguration/_Redigera konton..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguration/_��ndra aktuellt konto"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/_Hj辰lp/_Handbok"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hj辰lp/_Handbok/_Engelsk"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hj辰lp/_Handbok/_Japansk"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/_Hj辰lp/_FAQ"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hj辰lp/_FAQ/_Engelsk"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hj辰lp/_FAQ/_Tysk"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hj辰lp/_FAQ/_Spansk"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hj辰lp/_FAQ/_Fransk"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hj辰lp/_FAQ/_Italiensk"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/_Hj辰lp/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Skapar huvudf旦nster...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudf旦nster: f辰rgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "f辰rdigt.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Namnl旦s"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Byter f旦nsterseparationstyp fr奪n %d till %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr "Fr奪nkopplad"
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr "Du 辰r fr奪nkopplad. Vill du ansluta?"
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 msgid "Empty all trash"
 msgstr "T旦m alla papperskorgar"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 msgid "Empty messages in all trash?"
 msgstr "T旦m alla meddelanden i alla papperskorgar?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "L辰gg till brevl奪da"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3144,16 +3152,16 @@ msgstr ""
 "Om en existerande brevl奪da specificeras, kommer den\n"
 "att s旦kas igenom automatiskt."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Brevl奪dan \"%s\" finns redan."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Brevl奪da"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3162,141 +3170,141 @@ msgstr ""
 "Brevl奪dan kunde inte skapas.\n"
 "N奪gra filer finns redan eller s奪 saknar du skrivr辰ttigheter d辰r."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappvy"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 msgid "/Reply to _all"
 msgstr "/Svara till _alla"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 msgid "/Reply to _sender"
 msgstr "/Svara till av_s辰ndaren"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "H辰mta"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "H辰mta ny post"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "H辰mta allt"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "H辰mta ny post fr奪n alla konton"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Skicka k旦ade meddelanden"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "Skriv"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Skriv nytt meddelande"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Svara"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "Svara p奪 meddelandet"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "Svara alla"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Svara till alla"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "Vidarebefordra meddelandet"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "Ta bort meddelandet"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "Utf旦r k旦ade 奪tg辰rder"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "K旦r markerad process"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "N辰sta ol辰sta meddelande"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Inst."
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "Allm辰nna inst辰llningar"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Konto"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Kontoinst辰llningar"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 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:2445
+#: src/mainwindow.c:2447
 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:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
@@ -3418,28 +3426,28 @@ msgstr "Slutet av meddelandet n奪tt; forts辰tta fr奪n b旦rjan?"
 msgid "Search finished"
 msgstr "S旦kning klar"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "Skapar meddelandevy...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Text"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Bilagor"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3448,7 +3456,7 @@ msgstr ""
 "Skriv in utskriftskommando:\n"
 "(\"%s\" kommer att ers辰ttas med filnamnet)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3888,7 +3896,7 @@ msgstr "H辰mta alla meddelanden fr奪n server"
 msgid "Receive size limit"
 msgstr "Gr辰ns f旦r mottagningsstorlek"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "KB"
 
@@ -3908,7 +3916,7 @@ msgstr "(Ofiltrerade meddelanden kommer att lagras i denna mapp)"
 msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -3932,7 +3940,7 @@ msgstr "Skapa Meddelande-ID"
 msgid "Add user-defined header"
 msgstr "L辰gg till anv辰ndardefinierat brevhuvud"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr "Redigera..."
 
@@ -4405,30 +4413,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "F旦renklad kinesisk (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "F旦renklad kinesisk (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditionell kinesisk (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditionell kinesisk (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kinesisk (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Koreansk (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4437,11 +4450,11 @@ msgstr ""
 "Om \"Automatisk\" 辰r vald, kommer den optimala\n"
 "kodningen f旦r det nuvarande spr奪ket att anv辰ndas."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "Kodning f旦r 旦verf旦ring"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4450,118 +4463,118 @@ msgstr ""
 "Ange vilken kodning f旦r 旦verf旦ring meddelandetexten\n"
 "ska ha n辰r det inneh奪ller icke-ASCII-tecken."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "Signaturseparator"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Infoga automatiskt"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Starta automatiskt extern redigerare"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "��ngraniv奪"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "Radbryt meddelanden vid"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "tecken"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Radbryt citering"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Radbryt vid indata"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "Radbryt innan brevet skickas"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "V辰lj automatiskt konto f旦r svar"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Citera meddelande vid svar"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "Svara-knappen ger svar till e-postlista"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Svarsformat"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Citationstecken"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Vidarebefordringsformat"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Beskrivning av symboler "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Typsnitt"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "��vers辰tt brevhuvudsnamn (t.ex. \"Fr奪n:\", \"��rende:\")"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Visa antal ol辰sta bredvid mappnamn"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "F旦rkorta diskussionsgrupper l辰ngre 辰n"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "bokst辰ver"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "Summeringsvy"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Visa mottagare i \"Fr奪n\"-kolumnen om du sj辰lv 辰r avs辰ndaren"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Expandera tr奪dar"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Datumformat"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " St辰ll in f辰lt att visa i summeringen... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "Aktivera f辰rgl辰ggning av meddelande"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4569,327 +4582,327 @@ msgstr ""
 "Visa multi-byte-alfabet och -siffror som\n"
 "ASCII-tecken (endast Japanska)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Visa brevhuvudspanel ovanf旦r meddelandevy"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Visa korta brevhuvuden i meddelandevy"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Radavst奪nd"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "bildpunkter"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Rulla"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Halvsida"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Mjuk rullning"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Steg"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr "��ndra storlek p奪 bifogade stora bilder s奪 att de ryms i f旦nstret"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Brevhuvudsinst辰llning"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "Unders旦k signaturer automatiskt"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "Visa resultat av signaturunders旦kning i ett extraf旦nster"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Lagra l旦senfras tempor辰rt i minnet"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Utg奪r efter"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "minut(er)"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(L旦senfrasen kommer att lagras hela sessionen\n"
 "om 0 angivits)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "H奪ll fokus under inskrivning av l旦senfas"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Visa varning vid start om GnuPG inte fungerar"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "��ppna alltid meddelanden i summering, n辰r de valts"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "��ppna f旦rsta ol辰sta meddelande vid 旦ppning av mapp"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "Markera endast meddelande som l辰st, n辰r det 旦ppnats i nytt f旦nster"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "G奪 till inkorgen efter att ny post kommit"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Utf旦r omedelbart vid flyttning eller borttagande av meddelanden"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Meddelanden kommer endast vara markerade tills du v辰ljer\n"
 " \"Utf旦r k旦ade meddelanden\" om detta 辰r avst辰ngt)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Mottagningsdialog"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Visa mottagningsdialog"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Alltid"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr "Bara vid manuell mottagning"
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "Visa inte feldialog vid h辰mtningsfel"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "St辰ng mottagningsdialog efter奪t"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr "St辰ll in tangentbindningar..."
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externa kommandon (%s kommer att ers辰ttas med filnamn / URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Webbl辰sare"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "L辰gg till adress till destination vid dubbelklick"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "Vid avslut"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "Bekr辰fta avslut"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "T旦m papperskorg vid avslut"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Fr奪ga innan t旦mning"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Varna om det finns k旦ade meddelanden"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "V辰ntetid f旦r uttags-I/O (socket I/O):"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "sekunder"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "f旦rkortat veckodagsnamn"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "fullst辰ndigt veckodagsnamn"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "f旦rkortat m奪nadsnamn"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "fullst辰ndigt m奪nadsnamn"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "datum och tid g辰llande lokalt"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "奪rhundradetal (奪rtal/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "dagen i m奪naden som decimaltal"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "timmen som decimaltal enligt 24-timmarsr辰kning"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "timmen som decimaltal enligt 12-timmarsr辰kning"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "dagen p奪 奪ret som ett decimaltal"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "m奪naden som ett decimaltal"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "minuten som ett decimaltal"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "antingen AM eller PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "sekunden som ett decimaltal"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "veckodagen som ett decimaltal"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "datum g辰llande lokalt"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "de sista tv奪 siffrorna av ett 奪rtal"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "奪rtalet som ett decimaltal"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "tidszon eller namn eller f旦rkortning"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "Exempel"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "St辰ll in meddelandef辰rger"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "F辰rger"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Citerad text - F旦rsta niv奪n"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "Citerad text - Andra niv奪n"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "Citerad text - Tredje niv奪n"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI-l辰nk"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "��teranv辰nd citeringsf辰rger"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "V辰lj f辰rg f旦r citeringsniv奪 1"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "V辰lj f辰rg f旦r citeringsniv奪 2"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "V辰lj f辰rg f旦r citeringsniv奪 3"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "V辰lj f辰rg f旦r URI"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "Beskrivning av symboler"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4913,11 +4926,11 @@ msgstr ""
 "Diskussionsgrupper\n"
 "Meddelande-ID"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "Om x 辰r inst辰lld, visas expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4931,7 +4944,7 @@ msgstr ""
 "Citerad meddelandetext utan signatur\n"
 "Bokstavligt %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4943,15 +4956,15 @@ msgstr ""
 "Bokstavlig 旦ppnande klammerparentes\n"
 "Bokstavlig avslutande klammerparentes"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Typsnittsval"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Tangentbindningar"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4962,11 +4975,11 @@ msgstr ""
 "att trycka valfri tangent eller tangentkombination\n"
 "n辰r muspekaren 辰r 旦ver genv辰gen."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Gamla Sylpheed"
 
@@ -5034,190 +5047,185 @@ msgstr "Filterinst辰llningar"
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "Vill du verkligen ta bort denna regel?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Namnl旦s"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Ta bort regel"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 msgid "Filter rule"
 msgstr "Filterregel"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr "Om n奪got av f旦ljande villkor matchar"
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr "Om alla av f旦ljande villkor matchar"
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr "Utf旦r f旦ljande 奪tg辰rder:"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr "Till eller Kopia"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 msgid "Any header"
 msgstr "N奪got brevhuvud"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 msgid "Edit header..."
 msgstr "Redigera brevhuvud..."
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 msgid "Message body"
 msgstr "Meddelandetext"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr "Resultat av kommando"
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr "��lder"
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "inneh奪ller"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 msgid "doesn't contain"
 msgstr "inneh奪ller inte"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr "辰r"
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr "辰r inte"
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr "matchar regex"
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr "matchar inte regex"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr "辰r st旦rre 辰n"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr "辰r mindre 辰n"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr "辰r l辰ngre 辰n"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr "辰r kortare 辰n"
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Flytta till"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 msgid "Copy to"
 msgstr "Kopiera till"
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Ta inte emot"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 msgid "Delete from server"
 msgstr "Ta bort fr奪n server"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 msgid "Set mark"
 msgstr "Markera"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 msgid "Set color"
 msgstr "F辰rgmarkera"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 msgid "Mark as read"
 msgstr "Markera som l辰st"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 msgid "Forward as attachment"
 msgstr "Vidarebefordra som bilaga"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 msgid "Redirect"
 msgstr "Omdirigera"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 msgid "Execute command"
 msgstr "K旦r kommando"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr "Stoppa regelutv辰rdering"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 msgid "folder:"
 msgstr "mapp"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 msgid "address:"
 msgstr "adress"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 msgid "Edit header list"
 msgstr "Redigera brevhuvudlista"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 msgid "Headers"
 msgstr "Brevhuvuden"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 msgid "Header:"
 msgstr "Brevhuvud:"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 msgid "Rule name is not specified."
 msgstr "Regelnamn 辰r inte angivet."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 msgid "Command is not specified."
 msgstr "Kommando 辰r inte angivet."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr "Ogiltigt villkor existerar."
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 msgid "Destination folder is not specified."
 msgstr "Destinationsmapp 辰r inte angiven."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr "Ogiltig 奪tg辰rd existerar."
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 msgid "Condition not exist."
 msgstr "Villkor saknas."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 msgid "Action not exist."
 msgstr "��tg辰rd saknas"
 
@@ -5473,56 +5481,56 @@ msgstr "Uppr辰ttar f旦rbindelse"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Uppr辰ttar f旦rbindelse med SMTP-server: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "Skickar HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "Autentiserar"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "Skickar meddelande..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "Skickar EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "Skickar MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "Skickar"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "Skickar RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "Skickar DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "Avslutar..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Skickar meddelande (%d / %d byte)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "Fel uppstod n辰r meddelandet skickades."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5829,120 +5837,120 @@ msgstr "Nr."
 msgid "Creating summary view...\n"
 msgstr "Skapar summeringsvy...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "Behandla markering"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "N奪gra markeringar finns kvar. Behandla dem?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "S旦ker igenom mapp (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Inga fler ol辰sta meddelande"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Inget ol辰st meddelande funnet. S旦k fr奪n slutet?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "Inga ol辰sta meddelanden."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "Inget ol辰st meddelande funnet. G奪 till n辰sta mapp?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "S旦k igen"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "Inga fler nya meddelanden"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Inget nytt meddelande funnet. S旦k fr奪n slutet?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "Inga nya meddelanden."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "Inget nytt meddelande funnet. G奪 till n辰sta mapp?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Inga fler markerade meddelanden"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "Inget markerat meddelande funnet. S旦k fr奪n slutet?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "Inga markerade meddelanden."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "Inget markerat meddelande funnet. S旦k fr奪n b旦rjan?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Inga fler f辰rgade meddelanden"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Inget f辰rgat meddelande funnet. S旦k fr奪n slutet?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "Inga f辰rgade meddelanden."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Inget f辰rgat meddelande funnet. S旦k fr奪n b旦rjan?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Attraherar meddelanden efter 辰rende..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d borttagen"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttad"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopierad"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " objekt valda"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nya, %d ol辰sta, %d totalt (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nya, %d ol辰sta, %d totalt"
@@ -6114,6 +6122,9 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "skrivning till %s misslyckades.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "Uppdaterar alla mapptr辰d..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_Visa/_Kodning/---"
 
diff --git a/po/tr.po b/po/tr.po
index 1a05583f..0411cebf 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+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"
@@ -66,11 +66,11 @@ msgstr ""
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA adresine konuyla ilgili "
 "yaz脹n脹z."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "Her hesap i巽in yap脹land脹rma dosyalar脹 okunuyor...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -78,19 +78,19 @@ msgstr ""
 "Baz脹 d端zenleme pencereleri a巽脹k.\n"
 "L端tfen t端m d端zenleme pencerelerini kapatt脹ktan sonra hesaplar脹 d端zenleyin."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "Hesap d端zenleme penceresi a巽脹l脹yor...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "Hesap d端zenleme penceresi olu��turuluyor...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "Hesaplar脹 d端zenle"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -99,8 +99,8 @@ msgstr ""
 "kutucuklar脹 t脹klanarak bu hesaplar i巽in `Hepsini al' se巽ene��ini \n"
 "etkin duruma getirilebilir."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -108,60 +108,66 @@ msgstr ""
 msgid "Name"
 msgstr "聴sim"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "Protokol"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "Sunucu"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "Ekle"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "D端zenle"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " Sil "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "A��a��脹"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "Yukar脹"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " ��ntan脹ml脹 hesap olarak d端zenle "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "Bu hesab脹 silmek istiyor musunuz?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "Ba��l脹ks脹z"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "Hesab脹 sil"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "Bu hesab脹 silmek istiyor musunuz?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "Evet"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+Hay脹r"
 
@@ -230,7 +236,7 @@ msgstr " G旦nder"
 msgid "Abort"
 msgstr "聴ptal"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -241,11 +247,11 @@ msgstr ""
 "(`%%h' arg端man ile de��i��tirilecektir)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "Eylemin gizli kullan脹c脹 arg端man脹"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -256,7 +262,7 @@ msgstr ""
 "(`%%u' arg端man ile de��i��tirilecektir)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "Eylemin kullan脹c脹 arg端man脹"
 
@@ -264,7 +270,7 @@ msgstr "Eylemin kullan脹c脹 arg端man脹"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
@@ -350,8 +356,8 @@ msgstr "/_Adres/D端_zenle"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/A_ra巽lar"
 
@@ -359,13 +365,13 @@ msgstr "/A_ra巽lar"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_ra巽lar/_LDIF dosyas脹n脹 ekle"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/_Yard脹m"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/_Yard脹m/_Hakk脹nda"
 
@@ -382,10 +388,10 @@ msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -404,17 +410,17 @@ msgstr "/_Sil"
 msgid "E-Mail address"
 msgstr "聴leti adresi"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "Adres defteri"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "聴sim:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -582,7 +588,7 @@ msgid "Group"
 msgstr "Grup"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "Dizin"
 
@@ -606,7 +612,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Ki��isel adres"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "Not"
 
@@ -614,7 +620,7 @@ msgstr "Not"
 msgid "Warning"
 msgstr "Uyar脹"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "Hata"
 
@@ -626,31 +632,31 @@ msgstr "Uyar脹 panel penceresi olu��turuluyor...\n"
 msgid "Show this message next time"
 msgstr "Bu iletiyi sonraki a巽脹l脹��ta tekrar g旦ster"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "Turuncu"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "K脹rm脹z脹"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "Pembe"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "G旦k mavisi"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "Mavi"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "Ye��il"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "Kahverengi"
 
@@ -658,7 +664,7 @@ msgstr "Kahverengi"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "Hi巽biri"
 
@@ -670,8 +676,8 @@ msgstr "/_Ekle..."
 msgid "/_Remove"
 msgstr "/_Sil"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/��_zellikler..."
 
@@ -831,8 +837,8 @@ msgstr "/_G旦r端n端m/_Yan脹tla/"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/_G旦r端n端m/---"
 
@@ -859,7 +865,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -942,137 +948,142 @@ msgstr "/_G旦r端n端m/_Kodlama/Basit ��ince (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/_G旦r端n端m/_Kodlama/Basit ��ince (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_G旦r端n端m/_Kodlama/Geleneksel ��ince (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_G旦r端n端m/_Kodlama/Geleneksel ��ince (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_G旦r端n端m/_Kodlama/Korece (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_G旦r端n端m/_Kodlama/Tayca (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_G旦r端n端m/_Kodlama/Tayca (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/A_ra巽lar/_Adres defteri"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/A_ra巽lar/��_ablon"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/A_ra巽lar/E_ylemler"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/A_ra巽lar/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/A_ra巽lar/Harici _d端zenleyicide a巽"
 
-#: src/compose.c:674
+#: src/compose.c:676
 msgid "/_Tools/PGP Si_gn"
 msgstr "/A_ra巽lar/PGP 聴_mza"
 
-#: src/compose.c:675
+#: src/compose.c:677
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/A_ra巽lar/PGP ile ��_ifrele"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: dosya bulunamad脹\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "Metin b旦l端m端 al脹namad脹\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "Al脹nt脹 format脹 hatas脹."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet format脹 hatas脹"
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyas脹 bulunamad脹\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyas脹n脹n boyu bulunamad脹\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyas脹 bo��."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamad脹."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "聴leti: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "��ok par巽al脹 mesaj脹n bir k脹sm脹 al脹namad脹"
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [D端zenlendi]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 聴leti d端zenle (%s)"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "聴leti d端zenle (%s)"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "Al脹c脹 belirtilmedi."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "G旦nder"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu bo�� b脹rakt脹n脹z. Yine de g旦ndermek istiyor musunuz?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "al脹c脹 listesi al脹namad脹."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1080,26 +1091,26 @@ msgstr ""
 "聴letinin g旦nderilece��i hesap belirtilmedi.\n"
 "L端tfen g旦ndermeden 旦nce bir e-posta hesab脹 girin."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "聴leti, %s adresine g旦nderilirken bir hata olu��tu."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "聴leti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Se巽ilen `%s' anahtar kimli��iyle bir e��le��tirme yap脹lamad脹."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "dosya modu de��i��tirilemedi\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1109,140 +1120,140 @@ msgstr ""
 "%s / %s\n"
 "Yine de g旦nderilsin mi?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "ba��l脹klar yaz脹lamad脹\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "ileti kuyru��a g旦nderiliyor...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamad脹\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "ileti kuyru��a g旦nderilemedi\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "聴leti numaras脹 olu��turuldu: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "D端zenleme penceresi olu��turuluyor...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME t端r端"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "聴letiyi g旦nder"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "Sonra g旦nder"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "聴letiyi kuyru��a aktar ve sonra g旦nder"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "Taslak"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "聴巽er"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "Dosya i巽er"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "Ekle"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "Dosya ekle"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "聴mza"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "聴mza ekle"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "D端zenleyici"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "Harici bir d端zenleyici kullan"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "Sat脹r kayd脹r"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "T端m uzun sat脹rlar脹 kayd脹r"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "Ge巽ersiz MIME t端r端."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da bo��."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "��zellikler"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "Dosya ad脹"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Harici d端zenleyici komut sat脹r脹 ge巽ersiz: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1253,72 +1264,72 @@ msgstr ""
 "Bu s端reci sonland脹ray脹m m脹?\n"
 "Program脹n grup numaras脹 (GID): %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Grup numaras脹 %d olan s端re巽 sonland脹r脹ld脹"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Ge巽ici dosya: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "D端zenle: s端re巽 g旦r端nt端s端n端 i巽er\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "Harici d端zenleyici 巽al脹��t脹r脹lamad脹\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "Dosyaya yaz脹lamad脹\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Boru okumada hata\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "聴leti kuyru��a g旦nderilemedi."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya se巽"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "Dosya se巽"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "聴letiyi sil"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "Bu ileti de��i��tirildi. Silinsin mi?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "Sil"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "Tasla��a G旦nder"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s ��ablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "��ablonu uygula"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "De��i��tir"
 
@@ -1480,12 +1491,12 @@ msgstr "Dizini d端zenle"
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni ad脹ni girin:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin ad脹n脹 verin:"
 
@@ -1654,160 +1665,156 @@ msgstr "Yap脹land脹rma dosyas脹na kay脹t yap脹lamad脹\n"
 msgid "Select folder"
 msgstr "Dizini se巽"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "Gelen"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "G旦nderilen"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "Kuyruk"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "��旦p"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "YeniDizin"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' bir dizin ad脹 i巽inde olamaz."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' dizini zaten var."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' dizini olu��turulam脹yor."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/Yeni _dizin yarat..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/D_izinin ad脹n脹 de��i��tir"
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/Dizini _sil"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 msgid "/Empty _trash"
 msgstr "/��旦_p端 bo��alt"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/Y_eni iletileri al"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/Dizin a��ac脹n脹 _yeniden yarat"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/聴_letilerda ara..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 msgid "/Down_load"
 msgstr "/聴_ndir"
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Haber grubuna 端ye ol..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/H_aber grubunu sil"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "Dizin g旦r端nt端s端 olu��turuluyor...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "Yeni"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "Okunmam脹��"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "Dizin bilgisi ayarlan脹yor...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlan脹yor..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taran脹yor..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taran脹yor..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "Dizin a��ac脹n脹 yeniden tara"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Dizin a��ac脹 yeniden olu��turulacak. Devam edilsin mi?"
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "Dizin a��ac脹 yeniden yarat脹l脹yor..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 msgid "Rebuilding of the folder tree failed."
 msgstr "Dizin a��ac脹 yeniden olu��turulamad脹."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "T端m dizin a��a巽lar脹 yeniden yarat脹l脹yor..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s dizini se巽ildi\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "聴letiler %s i巽ine indiriliyor..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "聴letiler `%s' i巽ine indirilirken hata olu��tu."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1817,16 +1824,16 @@ msgstr ""
 "(E��er alt dizin i巽erecek bir dizin olu��turmak \n"
 "istiyorsan脹z, ad脹n脹n sonuna `/' karakteri getirin)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' i巽in yeni bir isim verin:"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "Dizini yeniden adland脹r"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1835,24 +1842,24 @@ msgstr ""
 "`%s' alt脹ndaki t端m dizinler ve mesajlar silinecek.\n"
 "Devam etmek istedi��inizden emin misiniz?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "Dizini sil"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "��旦p端 bo��alt"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "��旦pteki t端m iletiler silinsin mi?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1861,34 +1868,34 @@ msgstr ""
 "`%s' posta kutusu kald脹r脹ls脹n m脹?\n"
 "(聴letiler diskten silinmeyecektir)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesab脹 silinsin mi?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesab脹n脹 sil"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesab脹 silinsin mi?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "Haber grubu hesab脹n脹 sil"
 
@@ -1936,7 +1943,7 @@ msgstr "bilinmiyor"
 msgid "Can't retrieve newsgroup list."
 msgstr "Haber grubu listesi al脹namad脹."
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "Tamamland脹."
 
@@ -2219,7 +2226,7 @@ msgstr "LDIF dosyas脹n脹 Adres Defterine aktar"
 msgid "Prev"
 msgstr "��nceki"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2309,7 +2316,7 @@ msgstr "POP3 sunucusuna ba��lant脹 kuruluyor: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucuya ba��lant脹 kurulamad脹: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yap脹l脹yor..."
 
@@ -2339,7 +2346,7 @@ msgstr "聴letilerin boyutlar脹 al脹n脹yor (LIST)..."
 msgid "Deleting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "��脹k脹l脹yor"
 
@@ -2382,7 +2389,8 @@ msgstr "Dosyaya yaz脹lamad脹."
 msgid "Socket error."
 msgstr "protokol hatas脹"
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "Ba��lant脹 kar��脹 taraftan kesildi."
 
@@ -2399,11 +2407,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "Yetkilendirmede hata olu��tu."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2412,7 +2420,7 @@ msgstr ""
 "Yetkilendirme ba��ar脹s脹z:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr "Oturum zaman a��脹m脹na u��rad脹."
 
@@ -2826,320 +2834,320 @@ msgstr "/_G旦r端n端m/_Kodlama/Japonca (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_G旦r端n端m/_Kodlama/Japonca (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_G旦r端n端m/_Kodlama/��ince (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_G旦r端n端m/_Kodlama/Korece (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/_G旦r端n端m/Yeni _pencerede a巽"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/_G旦r端n端m/聴_leti kayna��脹"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/_G旦r端n端m/T端m _ba��l脹klar脹 g旦r端nt端le"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/_G旦r端n端m/_G旦r端n端m端 g端ncelle"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/聴_leti"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 msgid "/_Message/Recei_ve"
 msgstr "/聴_leti/_Al"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/聴_leti/_Al/Ge_巽erli hesaptan al"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/聴_leti/_Al/T_端m hesaplardan al"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/聴_leti/_Al/聴_ptal Et"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 msgid "/_Message/Recei_ve/---"
 msgstr "/聴_leti/_Al/---"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/聴_leti/_Kuyruktaki iletileri g旦nder"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/聴_leti/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/聴_leti/Yeni _ileti g旦nder"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/聴_leti/Yan脹tl_a"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/聴_leti/B_a��kas脹na yan脹tla"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/聴_leti/B_a��kas脹na yan脹tla/_herkese"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/聴_leti/B_a��kas脹na yan脹tla/_g旦nderene"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/聴_leti/B_a��kas脹na yan脹tla/eposta l_istesine"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/聴_leti/Y旦_nlendir"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/聴_leti/E_k olarak y旦nlendir"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/聴_leti/Y旦_nlendir"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/聴_leti/Ta��脹..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/聴_leti/_Kopyala..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/聴_leti/_Sil"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/聴_leti/聴��_aretle"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/聴_leti/聴��_aretle/聴��_aretle"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/聴_leti/聴��_aretle/聴��areti _kald脹r"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/聴_leti/聴��_aretle/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/聴_leti/聴��_aretle/O_kunmam脹�� olarak i��aretle"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/聴_leti/聴��_aretle/Ok_unmu�� olarak i��aretle"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/聴_leti/聴��_aretle/Hepsini _okunmu�� olarak i��aretle"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/聴_leti/Ye_niden d端zenle"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/A_ra巽lar/G旦ndereni adres defterine ekle"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/A_ra巽lar/_Dizin i巽indeki t端m iletileri filtrele"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 msgid "/_Tools/Filter _selected messages"
 msgstr "/A_ra巽lar/S_e巽ilen t端m mesajlar脹 filtrele"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/A_ra巽lar/Filtre _kural脹 olu��tur"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/A_ra巽lar/Filtre _kural脹 olu��tur/_Otomatik olu��tur"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/A_ra巽lar/Filtre _kural脹 olu��tur/_G旦nderene g旦re olu��tur"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/A_ra巽lar/Filtre _kural脹 olu��tur/_Al脹c脹ya g旦re olu��tur"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/A_ra巽lar/Filtre _kural脹 olu��tur/_Konuya g旦re olu��tur"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/A_ra巽lar/��_ift iletileri sil"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/A_ra巽lar/��_al脹��t脹r"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/A_ra巽lar/_Kay脹t penceresi"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/_Yap脹land脹rma"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Yap脹land脹rma/_Genel tercihler..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Yap脹land脹rma/F_iltre ayarlar脹..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/_Yap脹land脹rma/��_ablon..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/_Yap脹land脹rma/_Eylemler..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/_Yap脹land脹rma/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Yap脹land脹rma/_G端ncel hesap tercihleri..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Yap脹land脹rma/Y_eni hesap olu��tur..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Yap脹land脹rma/Hesaplar脹 _d端zenle..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Yap脹land脹rma/_G端ncel hesab脹 de��i��tir"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/Yard脹_m/_K脹lavuz"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/Yard脹_m/_K脹lavuz/聴_ngilizce"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Yard脹_m/_K脹lavuz/_Japonca"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/Yard脹_m/_SSS"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/Yard脹_m/_SSS/聴_ngilizce"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/Yard脹_m/_SSS/_Almanca"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Yard脹_m/_SSS/聴_spanyolca"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/Yard脹_m/_SSS/_Frans脹zca"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Yard脹_m/_SSS/聴_talyanca"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/Yard脹_m/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "Yeni pencere olu��turuluyor...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "AnaPencere: renk b旦l端��t端rmesi %d s脹ras脹nda hata olu��tu\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "bitti.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "Ba��l脹ks脹z"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "hi巽biri"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Pencere ay脹rma tarz脹 %d den %d e 巽evriliyor\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr "��evrimd脹��脹"
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr "��evrimd脹��脹s脹n脹z. ��evrimi巽i olunsun mu?"
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 msgid "Empty all trash"
 msgstr "T端m 巽旦p端 bo��alt"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 msgid "Empty messages in all trash?"
 msgstr "��旦pteki t端m iletiler silinsin mi?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3149,16 +3157,16 @@ msgstr ""
 "E��er varolan potsa kutusu verilirse, otomatik\n"
 "olarak taranacakt脹r."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3167,141 +3175,141 @@ msgstr ""
 "Posta kutusu olu��turulurken hata olu��tu.\n"
 "Baz脹 dosyalar bulunuyor olabilir veya yeterli izine sahip olmayabilirsiniz."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylheed - Dizin G旦r端n端m端"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - 聴leti G旦r端n端m端"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/_Yan脹tla"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 msgid "/Reply to _all"
 msgstr "/Her_kese yan脹tla"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 msgid "/Reply to _sender"
 msgstr "/_G旦nderene yan脹tla"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yan脹tla"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/_Y旦nlendir"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak y旦nlendir"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/Ye_niden y旦nlendir"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "Al"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "Yeni postalar脹 da��脹t"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "Hepsini al"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "T端m hesaplardaki postalar脹 da��脹t"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "Kuyruktaki iletileri g旦nder"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "D端zenle"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "Yeni ileti d端zenle"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "Yan脹tla"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "聴letiyi yan脹tla"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "Hepsine ynt."
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "Herkese yan脹tla"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "Y旦nlendir"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "聴letiyi y旦nlendir"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "聴letiyi sil"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "��al脹��t脹r"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "聴��aretli s端re巽leri 巽al脹��t脹r"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "Sonraki okunmam脹�� ileti"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "Tercihler"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "Ortak tercihler"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "Hesap"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "Hesap ayarlar脹"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 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:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr "��evrimi巽isiniz. ��evrimd脹��脹 olmak i巽in simgeye t脹klay脹n."
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "��脹k"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "Programdan 巽脹k脹ls脹n m脹?"
 
@@ -3424,28 +3432,28 @@ msgstr "聴letinin sonuna ula��脹ld脹, ba��脹ndan ba��lans脹n m脹?"
 msgid "Search finished"
 msgstr "Arama tamamland脹"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "聴leti g旦r端nt端s端 olu��turuluyor...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "Metin"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "Ekler"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyas脹 kaydedilemedi."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "Yazd脹r"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3454,7 +3462,7 @@ msgstr ""
 "Yazd脹rma komutunu giriniz:\n"
 "('%s' dosya ad脹yla de��i��tirilecek)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3894,7 +3902,7 @@ msgstr "Sunucudaki t端m iletileri indir"
 msgid "Receive size limit"
 msgstr "Al脹nan ileti boyutu s脹n脹r脹"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "KB"
 
@@ -3914,7 +3922,7 @@ msgstr "(Filtrelenmemi�� iletiler bu kutuda bekleyecektir)"
 msgid "Authentication method"
 msgstr "Kimlik denetim y旦ntemi"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "Otomatik"
 
@@ -3938,7 +3946,7 @@ msgstr "聴leti Numaras脹 Olu��tur"
 msgid "Add user-defined header"
 msgstr "Kullan脹c脹 tan脹ml脹 ba��l脹k ekle"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " D端zenle... "
 
@@ -4412,30 +4420,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "Basitle��tirilmi�� ��ince (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "Basitle��tirilmi�� ��ince (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "Geleneksel ��ince (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Geleneksel ��ince (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "��ince (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "Korece (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "Tayca (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "Tayca (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4444,11 +4457,11 @@ msgstr ""
 "E��er 'Otomatik' se巽ili ise yerelde kullan脹lan kod\n"
 "k端mesi kullan脹lacakt脹r."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "Transfer kod k端mesi"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4457,118 +4470,118 @@ msgstr ""
 "Mesaj g旦vdesi ASCII karakter i巽ermedi��i zaman kullan脹lacak\n"
 "聴巽erik Transfer Kodlamas脹n脹 se巽iniz."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "聴mza ay脹rac脹"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "Otomatik ekle"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "Harici d端zenleyici otomatik 巽al脹��t脹r"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "Geri alma seviyesi"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "聴letileri kayd脹r: "
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "karakter"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "Al脹nt脹 Kayd脹rmas脹"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "Girdide Kayd脹r"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "G旦ndermeden 旦nce kayd脹r"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "Yan脹tlamalarda hesab脹 otomatik se巽"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "Yan脹tlarken al脹nt脹 yap"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "Yan脹tla tu��u eposta listelerine de yan脹tlas脹n"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "Yan脹tlama format脹"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "Al脹nt脹 i��areti"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "Y旦nlendirme bi巽imi"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " Sembollerin a巽脹klamas脹 "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "Yaz脹tipi"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Ba��l脹k adlar脹n脹 巽evir('Kimden','Konu' gibi)"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "Dizin ad脹n脹n yan脹nda ka巽 tane okunmam脹�� posta oldu��unu g旦ster"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "Belirtilenden daha uzun olan haber gruplar脹n脹 k脹salt"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "posta"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "��zet G旦r端n端m"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "E��er g旦nderen kendimsem 'Kimden' sat脹r脹nda al脹c脹y脹 g旦ster"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "Dizileri Geni��let"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "Tarih bi巽imi"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " ��zetin g旦r端nt端 nesnesini belirt"
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "聴letileri renklendir"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4576,327 +4589,327 @@ msgstr ""
 "��ok bytel脹 alfabe veya numaralar脹 \n"
 "ASCII karakter olarak g旦ster(Sadece Japonca)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "Postalar脹 g旦sterirken 端st k脹s脹mda ba��l脹klar脹 g旦ster"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "Postalar脹 g旦sterirken k脹sa ba��l脹klar脹 g旦ster"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "Sat脹r bo��lu��u"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "benek"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "Kayd脹r"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "Yar脹m sayfa"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "Yumu��ak kayd脹r"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "Ad脹m"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr "Pencereye uymas脹 i巽in eklenmi�� b端y端k resimleri yen��den boyutland脹r"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "G旦r端nt端 ba��l脹��脹 ayarlar脹"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "聴mzalar脹 otomatik denetle"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "聴mza kontrol sonu巽lar脹n脹 ek pencerede g旦ster"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "Parolay脹 ge巽ici olarak haf脹zada sakla"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "Belirtilen s端re sonra ge巽erlili��ini yitir"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr " dakikada"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Bu de��ere '0' atayarak parolan脹n\n"
 "t端m oturuum s端resince saklanmas脹n脹 sa��layabilirsiniz.)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "Parolay脹 girerken girdiyi yakala"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG 巽al脹��mazsa ba��lang脹巽ta uyar脹 mesaj脹 g旦ster"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "Mesajlar se巽ildi��inde her zaman 旦zet halinda g旦ster"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "Bir dizine girildi��inde ilk okunmam脹�� iletiyi a巽"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "Posta sadece yeni pencerede okundu��unda okunmu�� olarak i��aretle"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "聴leti geldi��inde gelen kutusuna git"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Postay脹 silerken ve ta��脹rken 巽al脹��t脹r"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(E��er bu 旦zellik kapal脹 ise i��lem bitinceye kadar\n"
 "postalar i��aretlenecektir.)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "Alma penceresi"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "Alma penceresini g旦ster"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "Her zaman"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr "Sadece kullan脹c脹 kendi ald脹��脹nda"
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "Hi巽 bir zaman"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "Alma s脹ras脹nda bir hata olu��ursa ek pencerede g旦sterme"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "聴��lemler tamamland脹��脹nda alma penceresini kapat"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " Tu�� kombinasyonlar脹..."
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Harici d端zenleyici (%s, dosya ad脹/URL ile yer de��i��tirecektir)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Taray脹c脹"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "��ift t脹kland脹��脹nda adresi hedefe ekle"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "��脹k脹��ta"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "��脹k脹��ta sor"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "��脹k脹��ta 巽旦p端 bo��alt"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "Bo��altmadan 旦nce sor"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "Kuyrukta ileti varsa uyar"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "Soket I/O zaman a��脹m脹:"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "saniye"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "k脹sa hafta ad脹"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "tam hafta ad脹"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "k脹sa ay ad脹"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "tam ay ad脹"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "g端ncel yerel bilgisi i巽in tercih edilen g端n ve saat"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "y端zy脹l numaras脹 (y脹l/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "say脹 de��erinde ay脹n g端n端"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24 saatlik format kullan脹larak saat"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12 saatlik format kullan脹larak saat"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "y脹l脹n g端n端n端n say脹 de��eri"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "ay say脹 de��erinde"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "dakika"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "AM veya PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "saniye"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "haftan脹n g端n端"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "tercih edilen yerek saat"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "y脹l脹n son iki rakam脹"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "y脹l"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "Zaman dilimi veya ad脹"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "Belirtici"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "Tan脹m"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "��rnek"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "Posta renklerini belirt"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "Birinci derecen al脹nt脹 metin"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "聴kinci dereceden al脹nt脹 metin"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "��巽端nc端 dereceden al脹nt脹 metin"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URL ba��lant脹s脹"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "Al脹nt脹 renklerini d旦n端��t端r"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "Birinci dereceden al脹nt脹 rengini se巽iniz"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "聴kinci dereceden al脹nt脹 rengini se巽iniz"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "��巽端nc端 dereceden al脹nt脹 rengini se巽iniz"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "URL i巽in renk se巽iniz"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "sembollerin a巽脹klamalar脹"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4919,11 +4932,11 @@ msgstr ""
 "Habergrubu\n"
 "Mesaj Nosu"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "E��er x belirtilmi��se expr g旦ster"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4937,7 +4950,7 @@ msgstr ""
 "聴mzas脹z al脹nt脹 yap脹lan metin\n"
 "Tam %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4949,15 +4962,15 @@ msgstr ""
 "Tam <\n"
 "Tam >"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "Yaz脹tipi se巽imi"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "Tu�� ba��脹nt脹lar脹"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4967,11 +4980,11 @@ msgstr ""
 "Ayr脹ca men端de mousunuzun imleci 端zerindeyken herhangi bir tu��a\n"
 "basarak nesnelerin k脹sayollar脹n脹 de��i��tirebilirsiniz."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "��ntan脹ml脹"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "Eski Sylpheed"
 
@@ -5039,190 +5052,185 @@ msgstr "Filtre ayarlar脹"
 msgid "Enabled"
 msgstr "Etkin"
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "B kural脹 silmek istiyor musunuz?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "Ba��l脹ks脹z"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "Kural脹 sil"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 msgid "Filter rule"
 msgstr "Filtre kural脹"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr "A��a��脹daki herhangi bir kural e��le��irse"
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr "A��a��脹daki t端m ko��ullar e��le��irse"
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr "A��a��脹daki eylemleri ger巽ekle��tir:"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr "Kime veya CC"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 msgid "Any header"
 msgstr "Herhangi bir ba��l脹k"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 msgid "Edit header..."
 msgstr "Ba��l脹��脹 d端zenle..."
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 msgid "Message body"
 msgstr "聴leti g旦vdesi"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr "Komut sonucu"
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr "Ya��"
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "i巽eriyor"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 msgid "doesn't contain"
 msgstr "i巽ermiyor"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr "ise "
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr "de��il ise"
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr "regex ile e��le��tir"
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr "regex ile e��le��tirme"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr "b端y端kse"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr "k端巽端kse"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr "uzunsa"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr "k脹saysa"
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "Ta��脹"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 msgid "Copy to"
 msgstr "Kopyala"
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "Alma"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 msgid "Delete from server"
 msgstr "Sunucudan sil"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 msgid "Set mark"
 msgstr "聴��aretle"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 msgid "Set color"
 msgstr "Renk ata"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 msgid "Mark as read"
 msgstr "Okunmu�� olarak i��aretle"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 msgid "Forward as attachment"
 msgstr "Ek olarak y旦nlendir"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 msgid "Redirect"
 msgstr "Yeniden y旦nlendir"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 msgid "Execute command"
 msgstr "Komut 巽al脹��t脹r"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr "Kural d旦n端��端m端n端 durdur"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 msgid "folder:"
 msgstr "dizin:"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 msgid "address:"
 msgstr "Adres"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 msgid "Edit header list"
 msgstr "Ba��l脹k listesini d端zenle"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 msgid "Headers"
 msgstr "Ba��l脹klar"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 msgid "Header:"
 msgstr "Ba��l脹k:"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 msgid "Rule name is not specified."
 msgstr "Kural ad脹 belirtilmedi."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 msgid "Command is not specified."
 msgstr "Komut belirtilmedi."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr "Ge巽ersiz durum bulunuyor."
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 msgid "Destination folder is not specified."
 msgstr "Hedef dizin belirtilmedi."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr "Ge巽ersiz eylem bulunuyor."
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 msgid "Condition not exist."
 msgstr "Durum bulunamad脹."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 msgid "Action not exist."
 msgstr "Eylem bulunamad脹."
 
@@ -5477,56 +5485,56 @@ msgstr "Ba��lant脹 kuruluyor"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "SMTP sunucuya ba��lant脹 kuruluyor: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "HELO g旦nderiliyor..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr " Kimlik denetimi"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "聴leti g旦nderiliyor..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "EHLO g旦nderiliyor... "
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "MAIL FROM g旦nderiliyor..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "G旦nderiliyor"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "RCPT TO g旦nderiliyor..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "DATA g旦nderiliyor..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "��脹k脹l脹yor..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "聴leti g旦nderiliyor (%d / %d bayt)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "聴leti g旦nderiliyor"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "聴leti g旦nderilirken hata olu��tu."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5832,120 +5840,120 @@ msgstr "Hay脹r."
 msgid "Creating summary view...\n"
 msgstr "��zet olu��turuluyor...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "S端re巽 i��areti"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "Baz脹 i��aretler b脹rak脹lm脹��. 聴��lemeye devam edilsin mi?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Dizin taran脹yor (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "Ba��ka okunmam脹�� ileti yok"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "Okunmam脹�� ileti bulunamad脹. Sondan arat脹ls脹n m脹?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "Okunmam脹�� ileti yok."
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "Okunamam脹�� ileti yok. Di��er dizine ge巽ilsin mi?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "Yeniden ara"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "Ba��ka ileti yok"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "Yeni ileti yok. Sondan itibaren arans脹n m脹?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "Yeni ileti yok."
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "Yeni ileti yok. Sonraki dizine ge巽ilsin mi?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "Ba��ka i��aretlenmi�� posta yok"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "聴��aretlenmi�� ileti bulunamad脹. Sondan arat脹ls脹n m脹?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "聴��aretlenmi�� ileti yok."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "聴��aretlenmi�� ileti bulunamad脹. Ba��tan arat脹ls脹n m脹?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "Ba��ka etiketlenmi�� ileti yok"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "Ba��ka etiketlenlenmi�� ileti yok. Sondan arat脹ls脹n m脹?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "Ba��ka etiketlenmi�� ileti yok."
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Etkiketlenmi�� ileti bulunamad脹. Ba��tan arat脹ls脹n m脹?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "Konular脹na g旦re postalar 巽ekiliyor..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d silindi"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d ta��脹nd脹"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopyaland脹"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " 旦��e se巽ildi"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d yeni, %d okunmam脹��, toplam %d (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d yeni, %d okunmam脹��, toplam %d"
@@ -6117,6 +6125,9 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "yazarken hata olu��tu: %s\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "T端m dizin a��a巽lar脹 yeniden yarat脹l脹yor..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/_G旦r端n端m/_Kodlama/---"
 
diff --git a/po/uk.po b/po/uk.po
index 10eda7d8..953a6823 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 1.0.0beta1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: Sun 31 Oct 2004 23:17:57\n"
 "Last-Translator: O. Nykyforchyn <nick@pu.if,ua>, 2004.\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -67,11 +67,11 @@ msgstr ""
 "仗��仂亞��舒仄仂��; �磻��仂 ��亠 仆亠 ��舒从, 仗亳�������� �� Free Software Foundation, Inc., 59 "
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "丼亳��舒��仄仂 从仂仆����亞����舒������ 亟仍�� 从仂亢仆仂亞仂 亰舒仗亳����...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -79,19 +79,19 @@ msgstr ""
 "����亟从��亳��仂 亟亠�磻�� 于��从仆舒 亰 仆仂于亳仄亳 仍亳����舒仄亳.\n"
 "��舒从��亳亶��亠 ����, 弍��亟��-仍舒��从舒, 仗亠���� 仆��亢 ��亠亟舒亞��于舒��亳 仂弍仍��从仂于�� 亰舒仗亳��亳."
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "����亟从��亳于舒��仄仂 于��从仆仂 ��亠亟舒亞��于舒仆仆�� 仂弍仍��从仂于仂亞仂 亰舒仗亳����...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "弌��于仂���ﾑ�仄仂 于��从仆仂 ��亠亟舒亞��于舒仆仆�� 仂弍仍��从仂于仂亞仂 亰舒仗亳����...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "��亠亟舒亞����仄仂 仂弍仍��从仂于�� 亰舒仗亳��亳"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -99,8 +99,8 @@ msgstr ""
 "��仂���磲仂从 仗亠��亠于����从亳 仆仂于亳�� 仍亳������于. ��仂亰仆舒����亠 于 从仂仍仂仆���� `G'\n"
 "account'亳, �磻�� 仗仂仗仂于仆�ﾑﾑ������� ��亠��亠亰 `������亳仄舒��亳 于����'."
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -108,60 +108,66 @@ msgstr ""
 msgid "Name"
 msgstr "��仄'��"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "����仂��仂从仂仍"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "弌亠��于亠��"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "��仂亟舒��亳"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "��亠亟舒亞��于舒��亳"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr "��亳亟舒仍亳��亳"
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "��仆亳亰"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "��亞仂����"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " ������舒仆仂于亳��亳 �磻 default "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "��亳 亟��亶��仆仂 弍舒亢舒����亠 于亳亟舒仍亳��亳 ��亠亶 亰舒仗亳��?"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "��亠亰��舒亰于亳"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "��亳亟舒仍亳��亳 仂弍仍��从仂于亳亶 亰舒仗亳��"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "��亳 亟��亶��仆仂 弍舒亢舒����亠 于亳亟舒仍亳��亳 ��亠亶 亰舒仗亳��?"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "��于亢亠亢"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+����亰舒��仂"
 
@@ -230,7 +236,7 @@ msgstr "��仂��仍舒��亳"
 msgid "Abort"
 msgstr "��亠��亠��于舒��亳"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -241,11 +247,11 @@ msgstr ""
 "(`%%h' 弍��亟亠 亰舒仄��仆亠仆仂 舒��亞��仄亠仆��仂仄)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "����亳��仂于舒仆亳亶 舒��亞��仄亠仆�� 从仂��亳������于舒��舒"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -256,7 +262,7 @@ msgstr ""
 "(`%%u' 弍��亟亠 亰舒仄��仆亠仆仂 舒��亞��仄亠仆��仂仄)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "����亞��仄亠仆�� 从仂��亳������于舒��舒"
 
@@ -264,7 +270,7 @@ msgstr "����亞��仄亠仆�� 从仂��亳������于舒��舒"
 msgid "Add Address to Book"
 msgstr "��仂亟舒��亳 舒亟��亠���� 亟仂 从仆亳亞亳"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "��亟��亠��舒"
@@ -350,8 +356,8 @@ msgstr "/��亟��亠��舒/��亠亟舒亞��于舒��亳"
 msgid "/_Address/_Delete"
 msgstr "/��亟��亠��舒/��亳亟舒仍亳��亳"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/��仆��������仄亠仆��亳"
 
@@ -359,13 +365,13 @@ msgstr "/��仆��������仄亠仆��亳"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/��仆��������仄亠仆��亳/��仄仗仂������于舒��亳 ��舒亶仍 LDIF"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/��仂仗仂仄仂亞舒"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/��仂仗仂仄仂亞舒/����仂 仗��仂亞��舒仄��"
 
@@ -382,10 +388,10 @@ msgid "/New _Folder"
 msgstr "/��仂于舒 仗舒仗从舒"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -404,17 +410,17 @@ msgstr "/��亳亟舒仍亳��亳"
 msgid "E-Mail address"
 msgstr "��亟��亠��舒 e-mail"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "��亟��亠��仆舒 从仆亳亞舒"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "��仄'��:"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -577,7 +583,7 @@ msgid "Group"
 msgstr "������仗舒"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "��舒仗从舒"
 
@@ -601,7 +607,7 @@ msgstr "��亟��亠��舒 仂��亞舒仆��亰舒������"
 msgid "Personal address"
 msgstr "����仂弍亳����舒 舒亟��亠��舒"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "����亳仄����从舒"
 
@@ -609,7 +615,7 @@ msgstr "����亳仄����从舒"
 msgid "Warning"
 msgstr "��仂仗亠��亠亟亢亠仆仆��"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "��仂仄亳仍从舒"
 
@@ -621,31 +627,31 @@ msgstr "弌��于仂��亠仆仆�� 亟��舒仍仂亞�� ��亠��仄��仆仂于仂亞仂 仗仂仗亠��亠亟�
 msgid "Show this message next time"
 msgstr "��仂从舒亰舒��亳 ��亠 仗仂于��亟仂仄仍亠仆仆�� 仆舒������仗仆仂亞仂 ��舒亰��"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "����舒仆亢亠于亳亶"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "丼亠��于仂仆亳亶"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "��仂亢亠于亳亶"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "��仍舒从亳��仆亳亶"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "弌亳仆��亶"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "��亠仍亠仆亳亶"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "��仂��亳��仆亠于亳亶"
 
@@ -653,7 +659,7 @@ msgstr "��仂��亳��仆亠于亳亶"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "�����磻亳亶"
 
@@ -665,8 +671,8 @@ msgstr "/��仂亟舒��亳..."
 msgid "/_Remove"
 msgstr "/��亳亟舒仍亳��亳"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/��仍舒����亳于仂������..."
 
@@ -826,8 +832,8 @@ msgstr "/��亳亞仍�磲/��于仂��仂��仆�� 舒亟��亠��舒"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/��亳亞仍�磲/---"
 
@@ -854,7 +860,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -937,137 +943,142 @@ msgstr "/��亳亞仍�磲/��仂亟仂于舒 ��舒弍仍亳����/弌仗��仂��亠仆舒 从亳��舒亶���
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/��亳亞仍�磲/��仂亟仂于舒 ��舒弍仍亳����/弌仗��仂��亠仆舒 从亳��舒亶����从舒 (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/��亳亞仍�磲/��仂亟仂于舒 ��舒弍仍亳����/丐��舒亟亳����亶仆舒 从亳��舒亶����从舒 (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/��亳亞仍�磲/��仂亟仂于舒 ��舒弍仍亳����/丐��舒亟亳����亶仆舒 从亳��舒亶����从舒 (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/��亳亞仍�磲/��仂亟仂于舒 ��舒弍仍亳����/��仂��亠亶����从舒 (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/��亳亞仍�磲/��仂亟仂于舒 ��舒弍仍亳����/丐舒亶����从舒 (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/��亳亞仍�磲/��仂亟仂于舒 ��舒弍仍亳����/丐舒亶����从舒 (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/��仆��������仄亠仆��亳/��亟��亠��仆舒 从仆亳亞舒"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/��仆��������仄亠仆��亳/丿舒弍仍仂仆"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/��仆��������仄亠仆��亳/������"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/��仆��������仄亠仆��亳/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/��仆��������仄亠仆��亳/��亠亟舒亞��于舒��亳 亰仂于仆����仆��仄 ��亠亟舒从��仂��仂仄"
 
-#: src/compose.c:674
+#: src/compose.c:676
 msgid "/_Tools/PGP Si_gn"
 msgstr "/��仆��������仄亠仆��亳/����亟仗亳�� PGP"
 
-#: src/compose.c:675
+#: src/compose.c:677
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/��仆��������仄亠仆��亳/丿亳������于舒仆仆�� PGP"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: ��舒亶仍 仆亠 ����仆����\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "��亠 于亟舒仍仂���� 仂����亳仄舒��亳 ��亠从����仂于�� ��舒����亳仆��\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "��仂仄亳仍从舒 �� ��仂��仄舒���� ��亳����于舒仆仆��."
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "��仂仄亳仍从舒 �� ��仂��仄舒���� message reply/forward."
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "个舒亶仍 %s 仆亠 ����仆����\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "��亠 于亟舒仍仂���� 仂����亳仄舒��亳 ��仂亰仄���� %s\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "个舒亶仍 %s 仗仂��仂亢仆��亶."
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "��亠 于亟舒仍仂���� 仗��仂��亳��舒��亳 %s."
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "��亳����: %s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "��亠 于亟舒仍仂���� 仂����亳仄舒��亳 仂亟仆�� 亰 ��舒����亳仆 仍亳����舒."
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [��亠亟舒亞仂于舒仆亳亶]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 弌��于仂��亳��亳 仍亳����%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "弌��于仂��亳��亳 仍亳����%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "��亠 于从舒亰舒仆仂 仂����亳仄��于舒��舒."
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "��仂��仍舒��亳"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "��仂仍亠 Subject 仗仂��仂亢仆��. ����亠 亢 仗仂��仍舒��亳?"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "仆亠 于亟舒仍仂���� 仂����亳仄舒��亳 ��仗亳��仂从 仂����亳仄��于舒����于."
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1075,26 +1086,26 @@ msgstr ""
 "��弍仍��从仂于亳亶 亰舒仗亳�� 亟仍�� 于��亟��亳仍舒仆仆�� 仗仂����亳 仆亠 于从舒亰舒仆仂.\n"
 "��弍亠��������, 弍��亟��-仍舒��从舒, 亰舒仗亳�� 仗亠��亠亟 于��亟仗��舒于从仂��."
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "丐��舒仗亳仍舒���� 仗仂仄亳仍从舒 仗��亳 于��亟��亳仍舒仆仆�� 仍亳����舒 亟仂 %s ."
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "��亠 于亟舒仍仂���� 亰弍亠��亠亞��亳 仍亳���� 于 outbox."
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "��亠 于亟舒仍仂���� 亰仆舒亶��亳 从仍�ﾑ�舒, 于��亟仗仂于��亟仆仂亞仂 仂弍��舒仆仂仄�� ��亟亠仆��亳����从舒��仂���� `%s'."
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "仆亠 于亟舒仍仂���� 亰仄��仆亳��亳 仗��舒于舒 亟仂������仗�� ��舒亶仍舒\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1104,140 +1115,140 @@ msgstr ""
 "%s 仆舒 %s.\n"
 "����亠 亢 仗仂��仍舒��亳?"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "仆亠 于亟舒仍仂���� 亰舒仗亳��舒��亳 亰舒亞仂仍仂于从亳\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "仆亠 于亟舒仍仂���� 于亳亟舒仍亳��亳 ����舒��亳亶 仍亳����\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "仍亳���� 于 ��亠��亞��...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "仆亠 于亟舒仍仂���� 亰仆舒亶��亳 仗舒仗从�� ��亠��亞亳\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "仆亠 于亟舒仍仂���� 仗仂����舒于亳��亳 仍亳���� 于 ��亠��亞��\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "亞亠仆亠��仂于舒仆亳亶 Message-ID: %s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "����亟从��亳于舒��仄仂 于��从仆仂 ����于仂��亠仆仆�� 仍亳����舒...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "��亳仗 MIME"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "��仂亰仄����"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "����亟:"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "��仂��仍舒��亳 仍亳����"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "��仂��仍舒��亳 仗��亰仆����亠"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "��仂从仍舒����亳 于 仗舒仗从�� ��亠��亞亳 �� 仗仂��仍舒��亳 仗��亰仆����亠"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "丼仂��仆仂于亳从"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "��弍亠��亠亞��亳 于 仗舒仗���� ��仂��仆仂于亳从��于"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "������舒于亳��亳"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "������舒于亳��亳 ��舒亶仍"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "����亳��亟仆舒��亳"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "����亳��亟仆舒��亳 ��舒亶仍"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "����亟仗亳��"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "������舒于亳��亳 仗��亟仗亳��"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "��亠亟舒从��仂��"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "��亠亟舒亞��于舒��亳 亰仂于仆����仆��仄 ��亠亟舒从��仂��仂仄"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "��亞仂����舒仆仆�� ���磲从��于"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "��亞仂��仆����亳 于���� 亟仂于亞�� ���磲从亳"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "��亠仗��舒于亳仍��仆亳亶 ��亳仗 MIME."
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "个舒亶仍 仆亠 ����仆���� 舒弍仂 仗仂��仂亢仆��亶."
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "��仍舒����亳于仂������"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "��仂亟��于舒仆仆��"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "丿仍����"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "��仄'�� ��舒亶仍��"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "��仂仄舒仆亟仆亳亶 ���磲仂从 亰仂于仆����仆��仂亞仂 ��亠亟舒从��仂��舒 仆亠仗��舒于亳仍��仆亳亶: `%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1248,72 +1259,72 @@ msgstr ""
 "����亳仄����仂于仂 仂弍����于舒��亳 仗��仂��亠��?\n"
 "group id 仗��仂��亠����: %d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "��弍����于舒仆仂 仗��仂��亠�� 亰 group id: %d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "丐亳仄��舒��仂于亳亶 ��舒亶仍: %s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "弌��于仂��亠仆仆��: 于于��亟 于��亟 ��仗仂����亠����亞舒�ﾑ�仂亞仂 仗��仂��亠����\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "��亠 于亟舒仍仂���� 亰舒仗������亳��亳 亰仂于仆����仆��亶 ��亠亟舒从��仂��\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "��亠 于亟舒仍仂���� 亰舒仗亳��舒��亳 于 ��舒亶仍\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "��亠 于亟舒仍仂���� 仗��仂��亳��舒��亳 亰 从舒仆舒仍��\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "��亠 于亟舒仍仂���� 仗仂����舒于亳��亳 仍亳���� 于 ��亠��亞��."
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "��弍��舒��亳 ��舒亶仍"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "��弍��舒��亳 ��舒亶仍"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "����亟仄仂于亳��亳���� 于��亟 仍亳����舒"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "丶亠亶 仍亳���� 弍��仍仂 亰仄��仆亠仆仂. ����亟仄仂于亳��亳���� 于��亟 仆��仂亞仂?"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "����亟仄仂于亳��亳����"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "�� ��仂��仆仂于亳从亳"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "丼亳 弍舒亢舒����亠 ��亳 亰舒����仂����于舒��亳 ��舒弍仍仂仆 `%s' ?"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "��舒����仂����于舒��亳 ��舒弍仍仂仆"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "��舒仄��仆亳��亳"
 
@@ -1474,12 +1485,12 @@ msgstr "��亠亟舒亞��于舒��亳 仗舒仗从��"
 msgid "Input the new name of folder:"
 msgstr "��于亠亟������ 仆仂于�� 仆舒亰于�� 仗舒仗从亳:"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "��仂于舒 仗舒仗从舒"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "��于亠亟������ 仆舒亰于�� 仆仂于仂�� 仗舒仗从亳:"
 
@@ -1648,161 +1659,157 @@ msgstr "仆亠 于亟舒仍仂���� 亰舒仗亳��舒��亳 从仂仆����亞����舒������ 于 ��舒亶�
 msgid "Select folder"
 msgstr "��弍��舒��亳 仗舒仗从��"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "������亟仆��"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "����亟����仍舒仆��"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "丼亠��亞舒"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "��仂��亳从"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "丼仂��仆仂于亳从亳"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "��仂于舒��舒仗从舒"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' 仆亠 仄仂亢亠 仄������亳��亳���� 于 仆舒亰于�� 仗舒仗从亳."
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "��舒仗从舒 `%s' 于亢亠 ����仆����."
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "��亠 于亟舒仍仂���� ����于仂��亳��亳 仗舒仗从�� `%s'."
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/弌��于仂��亳��亳 仆仂于�� 仗舒仗从��..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/��亠��亠亶仄亠仆��于舒��亳 仗舒仗从��..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/��亳亟舒仍亳��亳 仗舒仗从��"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "弌仗仂��仂亢仆亳��亳 从仂��亳从"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/��亠��亠于����亳��亳 亰舒 仆仂于亳仄亳 仍亳����舒仄亳"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/��亠��亠弍��亟��于舒��亳 亟亠��亠于仂 仗舒仗仂从"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/丿��从舒��亳 仍亳����亳..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 msgid "/Down_load"
 msgstr "/��舒于舒仆��舒亢亳��亳"
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/��亠��亠亟仗仍舒��亳��亳 从仂仆��亠��亠仆������"
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/��亳亟舒仍亳��亳 从仂仆��亠��亠仆������"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "弌��于仂��亠仆仆�� 仂弍仍舒������ 仗亠��亠亞仍�磲�� 仗舒仗仂从...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "��仂于��"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "��亠仗��仂��亳��舒仆��"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "������舒仆仂于仍�ﾑ�仄仂 ��仆��仂��仄舒������ 仗舒仗从亳...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "������舒仆仂于仍�ﾑ�仄仂 ��仆��仂��仄舒������ 仗舒仗从亳..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "��亠��亠��亳������仄仂 仗舒仗从�� %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "��亠��亠��亳������仄仂 仗舒仗从�� %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "��亠��亠弍��亟��于舒��亳 亟亠��亠于仂 仗舒仗仂从"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "��亠��亠于仂 仗舒仗仂从 弍��亟亠 仗亠��亠弍��亟仂于舒仆仂. ����仂亟仂于亢亳��亳?"
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "��亠��亠弍��亟仂于����仄仂 亟亠��亠于仂 仗舒仗仂从..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 msgid "Rebuilding of the folder tree failed."
 msgstr "��亠 于亟舒仍仂���� 仗亠��亠弍��亟��于舒��亳 亟亠��亠于仂 仗舒仗仂从."
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "��亠��亠弍��亟仂于����仄仂 于���� 亟亠��亠于舒 仗舒仗仂从..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "��亠��亠于����亳��亳 亰舒 仆仂于亳仄亳 仍亳����舒仄亳 �� 于������ 仗舒仗从舒��..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "��舒仗从�� %s 仂弍��舒仆仂\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "��舒于舒仆��舒亢����仄仂 仍亳����亳 �� %s ..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "丐��舒仗亳仍舒���� 仗仂仄亳仍从舒 仗��亳 亰舒于舒仆��舒亢亠仆仆�� 仍亳������于 �� `%s'."
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1812,16 +1819,16 @@ msgstr ""
 "(�磻��仂 弍舒亢舒����亠 ����于仂��亳��亳 仗舒仗从��, �磻舒 仄������亳���� 仗��亟仗舒仗从亳,\n"
 " 亟仂亟舒亶��亠 `/' 于 从��仆���� 仆舒亰于亳)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "��于亠亟������ 仆仂于�� 仆舒亰于�� 亟仍�� `%s':"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "��亠��亠亶仄亠仆��于舒��亳 仗舒仗从��"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1830,24 +1837,24 @@ msgstr ""
 "������ 仗舒仗从亳 �� 仍亳����亳 于 `%s' 弍��亟亠 于亳亟舒仍亠仆仂.\n"
 "弌仗��舒于亟�� 弍舒亢舒����亠 于亳亟舒仍亳��亳?"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "��亳亟舒仍亳��亳 仗舒仗从��"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "��亠 于亟舒仍仂���� 于亳亟舒仍亳��亳 仗舒仗从�� `%s'."
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "弌仗仂��仂亢仆亳��亳 从仂��亳从"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "��亳亟舒仍亳��亳 于���� 仍亳����亳 亰 从仂��亳从舒?"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1856,34 +1863,34 @@ msgstr ""
 "弌仗��舒于亟�� 于亳亟舒仍亳��亳 ��从��亳仆��从�� `%s' ?\n"
 "(��亳����亳 ���� 于亳亟舒仍���ﾑ������� 亰 亟亳��从舒)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "��亳亟舒仍亳��亳 ��从��亳仆��从��"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "弌仗��舒于亟�� 于亳亟舒仍亳��亳 仂弍仍��从仂于亳亶 亰舒仗亳�� IMAP4 `%s'?"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "��亳亟舒仍亳��亳 仂弍仍��从仂于亳亶 亰舒仗亳�� IMAP4"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "����亶��仆仂 于亳亟舒仍亳��亳 从仂仆��亠��亠仆������ `%s'?"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "��亳亟舒仍亳��亳 从仂仆��亠��亠仆������"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "����亶��仆仂 于亳亟舒仍亳��亳 仂弍仍��从仂于亳亶 亰舒仗亳�� 从仂仆��亠��亠仆������ `%s'?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "��亳亟舒仍亳��亳 仂弍仍��从仂于亳亶 亰舒仗亳�� 从仂仆��亠��亠仆������"
 
@@ -1931,7 +1938,7 @@ msgstr "仆亠于��亟仂仄仂"
 msgid "Can't retrieve newsgroup list."
 msgstr "��亠 于亟舒仍仂���� 仂����亳仄舒��亳 ��仗亳��仂从 从仂仆��亠��亠仆����亶"
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "��亳从仂仆舒仆仂."
 
@@ -2214,7 +2221,7 @@ msgstr "��仄仗仂������于舒��亳 ��舒亶仍 LDIF 于 舒亟��亠��仆�� 从仆亳亞��"
 msgid "Prev"
 msgstr "��舒亰舒亟"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "��舒仍��"
 
@@ -2304,7 +2311,7 @@ msgstr "��'��亟仆����仄仂���� 亰 ��亠��于亠��仂仄 POP3: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "��亠 于亟舒仍仂���� 亰'��亟仆舒��亳���� 亰 ��亠��于亠��仂仄 POP3: %s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "��于��亠仆��亳����从舒������..."
 
@@ -2334,7 +2341,7 @@ msgstr "������亳仄����仄仂 ��仂亰仄���� 仍亳������于 (LIST)..."
 msgid "Deleting message %d"
 msgstr "��亳亟舒仍����仄仂 仍亳���� %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "��亳��仂亟亳仄仂"
 
@@ -2377,7 +2384,8 @@ msgstr "��亠 于亟舒仍仂���� 仗亳��舒��亳 于 ��舒亶仍."
 msgid "Socket error."
 msgstr "��仂仄亳仍从舒 ��仂从亠��舒."
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "��'��亟仆舒仆仆�� 亰舒从��亳��仂 于��亟亟舒仍亠仆亳仄 ��仂����仂仄."
 
@@ -2394,11 +2402,11 @@ msgstr ""
 "弌从��亳仆��从�� 亰舒弍仍仂从仂于舒仆仂:\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "��亠于亟舒��舒 舒����亠仆��亳����从舒������."
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2407,7 +2415,7 @@ msgstr ""
 "��亠于亟舒��舒 舒����亠仆��亳����从舒������:\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr "丐舒亶仄舒���� ��亠������."
 
@@ -2828,322 +2836,322 @@ msgstr "/��亳亞仍�磲/��仂亟仂于舒 ��舒弍仍亳����/亊仗仂仆����从舒 (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/��亳亞仍�磲/��仂亟仂于舒 ��舒弍仍亳����/亊仗仂仆����从舒 (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/��亳亞仍�磲/��仂亟仂于舒 ��舒弍仍亳����/��亳��舒亶����从舒 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/��亳亞仍�磲/��仂亟仂于舒 ��舒弍仍亳����/��仂��亠亶����从舒 (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/��亳亞仍�磲/����亟从��亳��亳 于 仆仂于仂仄�� 于��从仆��"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/��亳亞仍�磲/��亳����亟仆亳亶 ��亠从���� 仍亳����舒"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/��亳亞仍�磲/��仂从舒亰舒��亳 于亠���� 亰舒亞仂仍仂于仂从"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/��亳亞仍�磲/��仆仂于亳��亳 ��仗亳��仂从"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/��亳����"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 msgid "/_Message/Recei_ve"
 msgstr "/��亳����/������亳仄舒��亳"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/��亳����/������亳仄舒��亳/��仍�� 仗仂��仂��仆仂亞仂 亰舒仗亳����"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/��亳����/������亳仄舒��亳/��仍�� 于������ 亰舒仗亳����于"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/��亳����/������亳仄舒��亳/弌从舒����于舒��亳 仂����亳仄舒仆仆��"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 msgid "/_Message/Recei_ve/---"
 msgstr "/��亳����/������亳仄舒��亳/---"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/��亳����/����亟����仍舒��亳 于��亟从仍舒亟亠仆�� 仍亳����亳"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/��亳����/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/��亳����/��舒仗亳��舒��亳 仆仂于亳亶 仍亳����"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/��亳����/����亟仗仂于������亳"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/��亳����/����亟仗仂于������亳"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/��亳����/����亟仗仂于������亳/于����仄"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/��亳����/����亟仗仂于������亳/于��亟仗��舒于仆亳从��"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/��亳����/����亟仗仂于������亳/从仂仆��亠��亠仆������"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/��亳����/��亠��亠��仍舒��亳"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/��亳����/��亠��亠��仍舒��亳 �磻 于从仍舒亟亠仆仆��"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/��亳����/��亠��亠��仗���礆��于舒��亳"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/��亳����/��亠��亠仄������亳��亳"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/��亳����/��仂仗���ﾐ火委�亳"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/��亳����/��亳亟舒仍亳��亳"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/��亳����/��仂亰仆舒��从舒"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/��亳����/��仂亰仆舒��从舒/����仂弍亳��亳"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/��亳����/��仂亰仆舒��从舒/��仆����亳"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/��亳����/��仂亰仆舒��从舒/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/��亳����/��仂亰仆舒��从舒/��仂亰仆舒��亳��亳 �磻 仆亠仗��仂��亳��舒仆亳亶"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/��亳����/��仂亰仆舒��从舒/��仂亰仆舒��亳��亳 �磻 仗��仂��亳��舒仆亳亶"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/��亳����/��仂亰仆舒��从舒/��仂亰仆舒��亳��亳 于���� �磻 仗��仂��亳��舒仆��"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/��亳����/��仄��仆亳��亳"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/��仆��������仄亠仆��亳/��仂亟舒��亳 于��亟仗��舒于仆亳从舒 亟仂 舒亟��亠��仆仂�� 从仆亳亞亳"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/��仆��������仄亠仆��亳/个��仍��������于舒��亳 于���� 仍亳����亳 于 仗舒仗����"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 msgid "/_Tools/Filter _selected messages"
 msgstr "/��仆��������仄亠仆��亳/个��仍��������于舒��亳 于亳亟��仍亠仆�� 仍亳����亳"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/��仆��������仄亠仆��亳/弌��于仂��亳��亳 仗��舒于亳仍仂 ����仍��������于舒仆仆��"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/��仆��������仄亠仆��亳/弌��于仂��亳��亳 仗��舒于亳仍仂 ����仍��������于舒仆仆��/��于��仂仄舒��亳��仆仂"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/��仆��������仄亠仆��亳/弌��于仂��亳��亳 仗��舒于亳仍仂 ����仍��������于舒仆仆��/��舒 仗仂仍亠仄 `����亟'"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/��仆��������仄亠仆��亳/弌��于仂��亳��亳 仗��舒于亳仍仂 ����仍��������于舒仆仆��/��舒 仗仂仍亠仄 `��仂仄��'"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/��仆��������仄亠仆��亳/弌��于仂��亳��亳 仗��舒于亳仍仂 ����仍��������于舒仆仆��/��舒 仗仂仍亠仄 `丐亠仄舒'"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/��仆��������仄亠仆��亳/��亳亟舒仍亳��亳 仗仂于��仂���ﾐ火夷術� 仍亳����亳"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/��仆��������仄亠仆��亳/��亳从仂仆舒��亳"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/��仆��������仄亠仆��亳/����从仆仂 亢����仆舒仍��"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/��仂仆����亞����舒������"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/��仂仆����亞����舒������/弌仗��仍��仆�� 仆舒仍舒������于舒仆仆��..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/��仂仆����亞����舒������/��舒仍舒������于舒仆仆�� ����仍������舒..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/��仂仆����亞����舒������/丿舒弍仍仂仆..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/��仂仆����亞����舒������/������..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/��仂仆����亞����舒������/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/��仂仆����亞����舒������/��舒仍舒������于舒仆仆�� 仗仂��仂��仆仂亞仂 亰舒仗亳����..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/��仂仆����亞����舒������/弌��于仂��亳��亳 仆仂于亳亶 仂弍仍��从仂于亳亶 亰舒仗亳��..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/��仂仆����亞����舒������/��亠亟舒亞��于舒��亳 仂弍仍��从仂于�� 亰舒仗亳��亳..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/��仂仆����亞����舒������/��仄��仆亳��亳 仗仂��仂��仆亳亶 亰舒仗亳��"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/��仂于��亟从舒/��仂����弍仆亳从"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/��仂于��亟从舒/��仂����弍仆亳从/��仆亞仍��亶����从亳亶"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/��仂于��亟从舒/��仂����弍仆亳从/亊仗仂仆����从亳亶"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/��仂于��亟从舒/FAQ"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/��仂于��亟从舒/FAQ/��仆亞仍��亶����从亳亶"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/��仂于��亟从舒/FAQ/����仄亠����从亳亶"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/��仂于��亟从舒/FAQ/����仗舒仆����从亳亶"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/��仂于��亟从舒/FAQ/个��舒仆����亰��从亳亶"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/��仂于��亟从舒/FAQ/����舒仍��亶����从亳亶"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/��仂于��亟从舒/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "弌��于仂���ﾑ�仄仂 亞仂仍仂于仆亠 于��从仆仂...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "��仂仍仂于仆亠 ����从仆仂: 仆亠于亟舒��舒 ��仂亰仄����亠仆仆�� 从仂仍��仂���� %d\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "于亳从仂仆舒仆仂.\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "��亠亰��舒亰于亳"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "仆亠仄舒��"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "��仄��仆舒 ��亳仗�� ��仂亰亟��仍亠仆仆�� 于��从仆舒 亰 %d 仆舒 %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr "��亠亰 亰'��亟仆舒仆仆��"
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr "��'��亟仆舒仆仆�� 仆亠仄舒��. ����亟'��亟仆舒��亳����?"
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 #, fuzzy
 msgid "Empty all trash"
 msgstr "弌仗仂��仂亢仆亳��亳 从仂��亳从"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 #, fuzzy
 msgid "Empty messages in all trash?"
 msgstr "��亳亟舒仍亳��亳 于���� 仍亳����亳 亰 从仂��亳从舒?"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "��仂亟舒��亳 ��从��亳仆��从��"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3153,16 +3161,16 @@ msgstr ""
 "亊从��仂 于仂仆舒 于亢亠 ����仆����, ���� 弍��亟亠 仗亠��亠��亳��舒仆仂\n"
 "舒于��仂仄舒��亳��仆仂."
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "弌从��亳仆��从舒 `%s' 于亢亠 ����仆����."
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "弌从��亳仆��从舒"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3172,141 +3180,141 @@ msgstr ""
 "��仂亢仍亳于仂, 亟亠�磻�� ��舒亶仍亳 于亢亠 ����仆���ﾑ���, 舒弍仂 ��亳 仆亠 仄舒����亠\n"
 "仗��舒于舒 亰舒仗亳���� ������."
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - ��舒仗从亳"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ��亳����亳"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/����亟仗仂于������亳"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 msgid "/Reply to _all"
 msgstr "/����亟仗仂于������亳 于����仄"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 msgid "/Reply to _sender"
 msgstr "/����亟仗仂于������亳 于��亟仗��舒于仆亳从仂于��"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 msgid "/Reply to mailing _list"
 msgstr "/����亟仗仂于������亳 从仂仆��亠��亠仆������"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/��亠��亠��仍舒��亳 亟舒仍��"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/��亠��亠��仍舒��亳 亟舒仍�� �磻 于从仍舒亟亠仆仆��"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/��亠��亠��仗���礆��于舒��亳"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "������亳仄舒��亳"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "������亳仄舒��亳 仆仂于�� 仍亳����亳"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "������亳仄舒��亳 于����"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "������亳仄舒��亳 仆仂于�� 仍亳����亳 亟仍�� 于������ 亰舒仗亳����于"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "����亟����仍舒��亳 仍亳����(亳) 亰 ��亠��亞亳"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "弌��于仂��亠仆仆�� 仍亳����舒"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "��仂于亳亶 仍亳����"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "����亟仗仂于������亳"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "����亟仗仂于������亳 仆舒 仍亳����"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "����亟仗仂于������亳 于����仄"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "����亟仗仂于������亳 于����仄"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "��亠��亠��仍舒��亳"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "��亠��亠��仍舒��亳 仍亳����"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "��亳亟舒仍亳��亳 仍亳����"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "��亳从仂仆舒��亳"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "��亳从仂仆舒��亳 仗仂亰仆舒��亠仆亳亶 仗��仂��亠��"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "��舒������仗仆亳亶 仆亠仗��仂��亳��舒仆亳亶 仍亳����"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "��舒仍舒������于舒仆仆��"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "弌仗��仍��仆�� 仆舒仍舒������于舒仆仆��"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "��弍仍��从仂于亳亶 亰舒仗亳��"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "��舒仍舒������于舒仆仆�� 亰舒仗亳����"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr "��'��亟仆舒仆仆�� 仆亠仄舒��. ��仍舒��仆������ 仆舒 ��从仂仆����, ��仂弍 仗��亟'��亟仆舒��亳����."
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr "��亳 仗��亟'��亟仆舒仆��. ��仍舒��仆������ 仆舒 ��从仂仆����, ��仂弍 于��亟'��亟仆舒��亳����."
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "��亳����亟"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "��亳亶��亳 亰 �������� 仗��仂亞��舒仄亳?"
 
@@ -3428,28 +3436,28 @@ msgstr "��仂���磪仆����仂 从��仆���� 仍亳����舒; 仗��仂亟仂于亢亳��亳 亰 仗仂��
 msgid "Search finished"
 msgstr "��仂����从 亰舒从��仆��亠仆仂"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "弌��于仂���ﾑ�仄仂 仂弍仍舒������ 仗亠��亠亞仍�磲�� 仍亳����舒...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "丐亠从����"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "��从仍舒亟亠仆仆��"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "��亠 于亟舒仍仂���� 亰弍亠��亠亞��亳 ��舒亶仍 `%s'."
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "������从"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3458,7 +3466,7 @@ msgstr ""
 "��于亠亟������ 从仂仄舒仆亟�� 亟����从��:\n"
 "(`%s' 弍��亟亠 亰舒仄��仆亠仆仂 ��仄亠仆亠仄 ��舒亶仍舒)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3899,7 +3907,7 @@ msgstr "��舒于舒仆��舒亢亳��亳 于���� 仍亳����亳 仆舒 ��亠��于亠����"
 msgid "Receive size limit"
 msgstr "��弍仄亠亢亠仆仆�� ��仂亰仄������ 仂����亳仄舒仆亳�� 仍亳������于"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "��弍"
 
@@ -3919,7 +3927,7 @@ msgstr "(丐���� ��从仍舒亟舒��仄仂 仆亠于��亟����仍������仂于舒仆�� 仍亳����亳)"
 msgid "Authentication method"
 msgstr "��亠��仂亟 舒����亠仆��亳����从舒������"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "��于��仂仄舒��亳��仆仂"
 
@@ -3943,7 +3951,7 @@ msgstr "��亠仆亠����于舒��亳 Message-ID"
 msgid "Add user-defined header"
 msgstr "��亢亳于舒��亳 亰舒亞仂仍仂于仂从, 于亳亰仆舒��亠仆亳亶 从仂��亳������于舒��亠仄"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " ��亠亟舒亞��于舒��亳... "
 
@@ -4416,30 +4424,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "弌仗��仂��亠仆舒 从亳��舒亶����从舒 (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "弌仗��仂��亠仆舒 从亳��舒亶����从舒 (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "丐��舒亟亳����亶仆舒 从亳��舒亶����从舒 (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "丐��舒亟亳����亶仆舒 从亳��舒亶����从舒 (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "��亳��舒亶����从舒 (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "��仂��亠亶����从舒 (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "丐舒亶����从舒 (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "丐舒亶����从舒 (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4448,11 +4461,11 @@ msgstr ""
 "亊从��仂 于从仍�ﾑ�亠仆仂 `��于��仂仄舒��亳��仆舒', 弍��亟亠 仂弍��舒仆仂 仂仗��亳仄舒仍��仆亠\n"
 "从仂亟��于舒仆仆�� 亟仍�� 亟���ﾑ�仂�� locale."
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "��仂亟��于舒仆仆�� 仗亠��亠��亳仍从亳"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
@@ -4461,118 +4474,118 @@ msgstr ""
 "��从舒亢������ Content-Transfer-Encoding 亟仍�� 于亢亳于舒仆仆��,\n"
 "�磻��仂 ����仍仂 仍亳����舒 仄������亳���� 仆亠-ASCII ��亳仄于仂仍亳."
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "��仂亰亟��仍�ﾐ火委� 仗��亟仗亳����"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "������舒于亳��亳 舒于��仂仄舒��亳��仆仂"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "��于��仂仄舒��亳��仆仂 亰舒仗����从舒��亳 亰仂于仆����仆��亶 ��亠亟舒从��仂��"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "����于亠仆�� Undo"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "��亞仂����舒��亳 ���磲从亳 仍亳������于 仗����仍��"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "��亳仄于仂仍��于"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "��亞仂����舒��亳 ��亳����于舒仆仆��"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "��亞仂��仆����亳 仗��亳 于于仂亟��"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "��亞仂����舒��亳 仗亠��亠亟 于��亟��亳仍舒仆仆�礆"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "��于��仂仄舒��亳��仆仂 于亳弍亳��舒��亳 亰舒仗亳�� 亟仍�� 于��亟仗仂于��亟亠亶"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "丶亳����于舒��亳 仍亳���� 仗��亳 于��亟仗仂于��亟��"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "��仆仂仗从舒 于��亟仗仂于��亟�� 亰舒仗����从舒�� 于��亟仗仂于��亟�� 从仂仆��亠��亠仆������"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "个仂��仄舒�� 于��亟仗仂于��亟��"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "��仆舒从 ��亳��舒��亳"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "个仂��仄舒�� 仗亠��亠��亳仍舒仆仆��"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " ��仗亳�� ��亳仄于仂仍��于 "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "丿��亳����"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "��亠��亠从仍舒亟舒��亳 仆舒亰于亳 仗仂仍��于 亰舒亞仂仍仂于从舒 (�磻 `From:', `Subject:')"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "��仂从舒亰��于舒��亳 从��仍��从�������� 仆亠仗��仂��亳��舒仆仂亞仂 仗����仍�� 仆舒亰于亳 仗舒仗从亳"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "弌从仂��仂����于舒��亳 仆舒亰于亳 从仂仆��亠��亠仆����亶, 亟仂于���� 仆��亢"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "仍����亠��"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "弌仗亳��仂从 仗仂于��亟仂仄仍亠仆��"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "��仂从舒亰��于舒��亳 仂����亳仄��于舒��舒 于 从仂仍仂仆���� `����亟', �磻��仂 于��亟仗��舒于仆亳从 - ��亳"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "��仂亰亞仂����舒��亳 仂弍亞仂于仂��亠仆仆��"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "个仂��仄舒�� 亟舒��亳"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " ��仂从舒亰��于舒��亳 仆舒������仗仆�� 仗仂仍��... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "��仂亰于仂仍亳��亳 ��仂亰��舒��弍��于舒仆仆�� 仍亳������于"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4580,327 +4593,327 @@ msgstr ""
 "����亟仂弍��舒亢舒��亳 2-弍舒亶��仆亳亶 舒仍��舒于���� �� ��亳��仍舒\n"
 "仂亟仆仂弍舒亶��仆亳仄 ��亳仄于仂仍仂仄 (亟仍�� �礚仂仆����从仂�� 仄仂于亳)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "��仂从舒亰��于舒��亳 仗舒仆亠仍�� 亰舒亞仂仍仂于从舒 仆舒亟 仍亳����仂仄"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "��仂从舒亰��于舒��亳 ��从仂��仂��亠仆�� 亰舒亞仂仍仂于从亳 仗��亳 仗亠��亠亞仍�磲�� 仍亳������于"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "����亢���磲从仂于亳亶 ��仆��亠��于舒仍"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "仗��从��亠仍��于"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "����仂从������从舒"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "����于����仂����仆从亳"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "��仍舒于仆舒 仗��仂从������从舒"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "����仂从"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr "��舒������舒弍��于舒��亳 仗��亳��亟仆舒仆�� 从舒����亳仆从亳 于��亟仗仂于��亟仆仂 亟仂 于��从仆舒"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "��舒仍舒������于舒仆仆�� 于��亟仂弍��舒亢亠仆仆�� 亰舒亞仂仍仂于从舒"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "��于��仂仄舒��亳��仆仂 仗亠��亠于��������亳 仗��亟仗亳��亳"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "��仂从舒亰��于舒��亳 ��亠亰��仍����舒�� 仗亠��亠于����从亳 仗��亟仗亳���� �� ��仗仍亳于舒�ﾑ�仂仄�� 于��从仆��"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "丐亳仄��舒��仂于仂 亰弍亠����亞舒��亳 仗舒��仂仍�� 于 仗舒仄'������"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "��亠亟��亶��仆亳亶 仗����仍��"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "��于亳仍亳仆 "
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(����亳��于仂��仆仆�� '0' 亰弍亠����亞舒�� 仗舒��仂仍�� 仗��仂���磪仂仄\n"
 " 于�������� ��亠������)"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "��舒��仂仗亳��亳 于于��亟 仗��亳 于于亠亟亠仆仆�� 仗舒��仂仍��"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "��仂仗亠��亠亟亢舒��亳 仗��亳 亰舒仗����从��, �磻��仂 GnuPG 仆亠 仗��舒���ﾑ�"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "��舒于亢亟亳 于��亟从��亳于舒��亳 仍亳����亳 �� ��仗亳��从�� 仗��亳 于亳亟��仍亠仆仆��"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "����亟从��亳于舒��亳 仗亠����亳亶 仆亠仗��仂��亳��舒仆亳亶 仍亳����, 于��仂亟����亳 于 仗舒仗从��"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "��仂亰仆舒��舒��亳 �磻 仗��仂��亳��舒仆亳亶 ����仍��从亳 仍亳����, 于��亟从��亳��亳亶 �� 仆仂于仂仄�� 于��从仆��"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "��亠��亠��仂亟亳��亳 �� 仗舒仗从�� `������亟仆��', 仂����亳仄舒于��亳 仆仂于�� 仗仂������"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "��亳从仂仆��于舒��亳 仆亠亞舒亶仆仂 仗����仍�� 于亳亟舒仍亠仆仆�� ��亳 仗亠��亠仄����亠仆仆�� 仍亳������于"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(��亳����亳 弍��亟亠 仗仂亰仆舒��亠仆仂 亟仂 于亳从仂仆舒仆仆��,\n"
 " �磻��仂 ��亠 于亳仄从仆����亳)"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "����舒仍仂亞 仂����亳仄舒仆仆��"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "��仂从舒亰��于舒��亳 亟��舒仍仂亞 仂����亳仄舒仆仆��"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "��舒于亢亟亳"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr "丐��仍��从亳 仗��亳 ������仆仂仄�� 仂����亳仄舒仆仆��"
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "����从仂仍亳"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "��亠 于亳亟舒于舒��亳 亟��舒仍仂亞 仗��亳 仗仂仄亳仍���� 仂����亳仄舒仆仆��"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "��舒从��亳��亳 亟��舒仍仂亞 仂����亳仄舒仆仆�� 仗����仍�� 亰舒于亠����亠仆仆��"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " ������舒仆仂于亳��亳 亞舒�������� 从仍舒于������... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "��仂于仆����仆�� 从仂仄舒仆亟亳 (%s 弍��亟亠 亰舒仄��仆亠仆仂 仆舒 ��仄'�� ��舒亶仍�� / URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "Web-弍��舒��亰亠��"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "��仂亟舒��亳 舒亟��亠���� 亟仂 仗��亳亰仆舒��亠仆仆��, 从仂仍亳 从仍舒��仆����亳 亟于������"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "����亳 于亳��仂亟��"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "����亟��于亠��亟亳��亳 仗��亳 于亳��仂亟��"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "����亳 于亳��仂亟�� 仂��亳��舒��亳 从仂��亳从"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "��亳��舒��亳 仗亠��亠亟 仂��亳��亠仆仆�礆"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "��仂仗亠��亠亟亢舒��亳, �磻��仂 �� 仍亳����亳 于 ��亠��亰��"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "丐舒亶仄舒���� ��仂从亠��舒 于于仂亟��/于亳于仂亟��"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "��亠从��仆亟"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "仗仂于仆舒 ��从仂��仂��亠仆舒 仆舒亰于舒 亟仆�� ��亳亢仆��"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "仗仂于仆舒 仆舒亰于舒 亟仆�� ��亳亢仆��"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "��从仂��仂��亠仆舒 仆舒亰于舒 仄����������"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "仗仂于仆舒 仆舒亰于舒 仄����������"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "弍舒亢舒仆舒 亟舒��舒 �� ��舒�� 亟仍�� 仗仂��仂��仆仂�� locale"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "仆仂仄亠�� ����仂���������� (����从/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "亟亠仆�� 仄���������� �磻 亟亠������从仂于亠 ��亳��仍仂"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "亞仂亟亳仆舒 �磻 亟亠������从仂于亠 ��亳��仍仂 亰舒 24-亞仂亟亳仆仆亳仄 ��亳��亠��弍仍舒��仂仄"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "亞仂亟亳仆舒 �磻 亟亠������从仂于亠 ��亳��仍仂 亰舒 12-亞仂亟亳仆仆亳仄 ��亳��亠��弍仍舒��仂仄"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "亟亠仆�� ��仂从�� �磻 亟亠������从仂于亠 ��亳��仍仂"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "仄���������� �磻 亟亠������从仂于亠 ��亳��仍仂"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "��于亳仍亳仆亳 �磻 亟亠������从仂于亠 ��亳��仍仂"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "AM ��亳 PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "��亠从��仆亟亳 �磻 亟亠������从仂于亠 ��亳��仍仂"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "亟亠仆�� ��亳亢仆�� �磻 亟亠������从仂于亠 ��亳��仍仂"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "弍舒亢舒仆舒 亟舒��舒 亟仍�� 仗仂��仂��仆仂�� locale"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "仂����舒仆仆�� 亟于�� ��亳����亳 ��仂从��"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "����从 �磻 亟亠������从仂于亠 ��亳��仍仂"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "��舒��仂于舒 亰仂仆舒 舒弍仂 ��仄'�� 舒弍仂 ��从仂��仂��亠仆仆��"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "弌仗亠��亳����从舒��仂��"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "��仗亳��"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "����亳从仍舒亟"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "������舒仆仂于亳��亳 从仂仍��仂��亳 仍亳����舒"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "��仂仍��仂��亳"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "丶亳��仂于舒仆亳亶 ��亠从���� - 仗亠����亳亶 ����于亠仆��"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "丶亳��仂于舒仆亳亶 ��亠从���� - 亟����亞亳亶 ����于亠仆��"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "丶亳��仂于舒仆亳亶 ��亠从���� - ����亠����亶 ����于亠仆��"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "��仂于��仂��仆仂 于亳从仂��亳����舒��亳 从仂仍��仂��亳 ��亳����于舒仆仆��"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "��弍��舒��亳 从仂仍���� 亟仍�� ��亳����于舒仆仆�� ����于仆�� 1"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "��弍��舒��亳 从仂仍���� 亟仍�� ��亳����于舒仆仆�� ����于仆�� 2"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "��弍��舒��亳 从仂仍���� 亟仍�� ��亳����于舒仆仆�� ����于仆�� 3"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "��弍��舒��亳 从仂仍���� 亟仍�� URI"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "��仗亳�� ��亳仄于仂仍��于"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4924,11 +4937,11 @@ msgstr ""
 "Newsgroups\n"
 "Message-ID"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "�磻��仂 于����舒仆仂于仍亠仆仂 x, 仗仂从舒亰���� expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4942,7 +4955,7 @@ msgstr ""
 "丐��仍仂 ��亳��仂于舒仆仂亞仂 仗仂于��亟仂仄仍亠仆仆�� 弍亠亰 仗��亟仗亳����\n"
 "����从于舒仍��仆仂 %"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4954,15 +4967,15 @@ msgstr ""
 "����从于舒仍��仆舒 于��亟从��亳于舒�ﾑ�舒 ����亞����仆舒 亟��亢从舒\n"
 "����从于舒仍��仆舒 亰舒从��亳于舒�ﾑ�舒 ����亞����仆舒 亟��亢从舒"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "��亳弍���� ����亳����舒"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "��舒�������� 从仍舒于������"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4972,11 +4985,11 @@ msgstr ""
 "��亳 ��舒从仂亢 仄仂亢亠��亠 亰仄��仆亳��亳 从仂亢亠仆 shortcut 仄亠仆��, 仆舒��亳��仆��于��亳\n"
 "弍��亟��-�磻��(��) 从仍舒于������(��), ����亳仄舒�ﾑ�亳 于从舒亰��于仆亳从 仄亳���� 仆舒 仗��仆从����."
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "��仂 亰舒仄仂于����于舒仆仆��"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "弌��舒��亳亶 Sylpheed"
 
@@ -5044,190 +5057,185 @@ msgstr "��舒仍舒������于舒仆仆�� ����仍������舒"
 msgid "Enabled"
 msgstr "��于��仄从仆亠仆仂"
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "弌仗��舒于亟�� 弍舒亢舒����亠 于亳亟舒仍亳��亳 ��亠 仗��舒于亳仍仂?"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "��亠亰��舒亰于亳"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "��亳亟舒仍亳��亳 仗��舒于亳仍仂"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 msgid "Filter rule"
 msgstr "����舒于亳仍仂 ����仍��������于舒仆仆��"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr "亊从��仂 于亳从仂仆舒仆仂 弍��亟��-�磻�� 亰 ��仄仂于"
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr "亊从��仂 于亳从仂仆舒仆仂 于���� ��仄仂于亳"
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr "��亳从仂仆舒��亳 ��舒从�� 亟����:"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr "��仂仄�� 舒弍仂 ��仂仗����"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 msgid "Any header"
 msgstr "��仂亢亠仆 亰舒亞仂仍仂于仂从"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 msgid "Edit header..."
 msgstr "��亠亟舒亞��于舒��亳 亰舒亞仂仍仂于仂从..."
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 msgid "Message body"
 msgstr "丐��仍仂 仗仂于��亟仂仄仍亠仆仆��"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr "��亠亰��仍����舒�� 从仂仄舒仆亟亳"
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr "��舒于仆��������"
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "仄������亳����"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 msgid "doesn't contain"
 msgstr "仆亠 仄������亳����"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr "��"
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr "仆亠 ��"
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr "于��亟仗仂于��亟舒�� ��亠亞��仍����仆仂仄�� 于亳��舒亰��"
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr "仆亠 于��亟仗仂于��亟舒�� ��亠亞��仍����仆仂仄�� 于亳��舒亰��"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr "弍��仍���� 仆��亢"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr "仄亠仆�� 仆��亢"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr "亟仂于��亠, 仆��亢"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr "从仂��仂����亠, 仆��亢"
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "��亠��亠仆亠����亳 ��"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 msgid "Copy to"
 msgstr "��仂仗���ﾐ火委�亳 于"
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "��亠 仂����亳仄��于舒��亳"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 msgid "Delete from server"
 msgstr "��亳亟舒仍亳��亳 亰 ��亠��于亠��舒"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 msgid "Set mark"
 msgstr "������舒仆仂于亳��亳 仗仂亰仆舒��从��"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 msgid "Set color"
 msgstr "������舒仆仂于亳��亳 从仂仍����"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 msgid "Mark as read"
 msgstr "��仂亰仆舒��亳��亳 �磻 仗��仂��亳��舒仆亠"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 msgid "Forward as attachment"
 msgstr "��亠��亠��仍舒��亳 亟舒仍�� �磻 于从仍舒亟亠仆仆��"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 msgid "Redirect"
 msgstr "��亠��亠��仗���礆��于舒��亳"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 msgid "Execute command"
 msgstr "��亳从仂仆舒��亳 从仂仄舒仆亟��"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr "����亳仗亳仆亳��亳 仂弍��亳��仍亠仆仆�� 仗��舒于亳仍舒"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 msgid "folder:"
 msgstr "仗舒仗从舒:"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 msgid "address:"
 msgstr "舒亟��亠��舒:"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 msgid "Edit header list"
 msgstr "��亠亟舒亞��于舒��亳 ��仗亳��仂从 亰舒亞仂仍仂于从��于"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 msgid "Headers"
 msgstr "��舒亞仂仍仂于从亳"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 msgid "Header:"
 msgstr "��舒亞仂仍仂于仂从:"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 msgid "Rule name is not specified."
 msgstr "��亠 于从舒亰舒仆仂 仆舒亰于�� 仗��舒于亳仍舒."
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 msgid "Command is not specified."
 msgstr "��亠 亰舒亟舒仆仂 从仂仄舒仆亟��."
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr "����仆���� 仆亠仗��亳亟舒��仆舒 ��仄仂于舒."
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 msgid "Destination folder is not specified."
 msgstr "��舒仗从�� 仗��亳亰仆舒��亠仆仆�� 仆亠 于从舒亰舒仆仂."
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr "����仆���� 仆亠仗��亳亟舒��仆舒 亟����."
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 msgid "Condition not exist."
 msgstr "丕仄仂于舒 仆亠 ����仆����."
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 msgid "Action not exist."
 msgstr "������ 仆亠 ����仆����."
 
@@ -5482,56 +5490,56 @@ msgstr "��'��亟仆����仄仂����"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "��'��亟仆舒仆仆�� 亰 ��亠��于亠��仂仄 SMTP: %s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "��仂��亳仍舒��仄仂 HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "������亠仆��亳����从舒������"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "��仂��亳仍舒��仄仂 仍亳����..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "��仂��亳仍舒��仄仂 EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "��仂��亳仍舒��仄仂 MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "��仂��亳仍舒��仄仂"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "��仂��亳仍舒��仄仂 RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "��仂��亳仍舒��仄仂 DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "��亳��仂亟亳仄仂..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "��仂��亳仍舒��仄仂 仍亳���� (%d / %d 弍舒亶����于)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "��仂��亳仍舒��仄仂 仍亳����"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "����亳 于��亟��亳仍舒仆仆�� 仍亳����舒 ����舒仗亳仍舒���� 仗仂仄亳仍从舒."
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5840,120 +5848,120 @@ msgstr "��仂仄亠��"
 msgid "Creating summary view...\n"
 msgstr "弌��于仂���ﾑ�仄仂 仂弍仍舒������ 仗亠��亠亞仍�磲�� ��仗亳��从舒...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "��弍��仂弍从舒 仗仂亰仆舒��仂从"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "��舒仍亳��亳仍亳���� 亟亠�磻�� 仗仂亰仆舒��从亳. ��仗��舒���ﾐ火委�亳?"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "��亠��亠��亳������仄仂 仗舒仗从�� (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "����仍����亠 仆亠仄舒�� 仆亠仗��仂��亳��舒仆亳�� 仍亳������于"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "��亠 亰仆舒亶亟亠仆仂 仆亠仗��仂��亳��舒仆亳�� 仍亳������于. 丿��从舒��亳 亰 从��仆����?"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "��亠仄舒�� 仆亠仗��仂��亳��舒仆亳�� 仍亳������于"
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "��亠 亰仆舒亶亟亠仆仂 仆亠仗��仂��亳��舒仆亳�� 仍亳������于. ��亠��亠亶��亳 亟仂 仆舒������仗仆仂�� 仗舒仗从亳?"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "丿��从舒��亳 亰仆仂于��"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "����仍����亠 仆亠仄舒�� 仆仂于亳�� 仍亳������于"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "��亠 亰仆舒亶亟亠仆仂 仆仂于亳�� 仍亳������于. 丿��从舒��亳 亰 从��仆����?"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "��亠仄舒�� 仆仂于亳�� 仍亳������于"
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "��亠 亰仆舒亶亟亠仆仂 仆仂于亳�� 仍亳������于. ��亠��亠亶��亳 亟仂 仆舒������仗仆仂�� 仗舒仗从亳?"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "����仍����亠 仆亠仄舒�� 仗仂亰仆舒��亠仆亳�� 仍亳������于"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "��亠 亰仆舒亶亟亠仆仂 仗仂亰仆舒��亠仆亳�� 仍亳������于. 丿��从舒��亳 亰 从��仆����?"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "��亠仄舒�� 仗仂亰仆舒��亠仆亳�� 仍亳������于."
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "��亠 亰仆舒亶亟亠仆仂 仗仂亰仆舒��亠仆亳�� 仍亳������于. 丿��从舒��亳 亰 仗仂��舒��从��?"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "����仍����亠 仆亠仄舒�� 于亳亟��仍亠仆亳�� 仍亳������于"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "��亠 亰仆舒亶亟亠仆仂 于亳亟��仍亠仆亳�� 仍亳������于. 丿��从舒��亳 亰 从��仆����?"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "��亠仄舒�� 于亳亟��仍亠仆亳�� 仍亳������于"
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "��亠 亰仆舒亶亟亠仆仂 于亳亟��仍亠仆亳�� 仍亳������于. 丿��从舒��亳 亰 仗仂��舒��从��?"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "������仗��于舒仆仆�� 仍亳������于 亰舒 ��亠仄舒仄亳..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d 于亳亟舒仍亠仆仂"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 仗亠��亠仄����亠仆仂"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d ��从仂仗��亶仂于舒仆仂"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " 亰舒仗亳����于 仂弍��舒仆仂"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 仆仂于亳��, %d 仆亠仗��仂��亳��舒仆亳��, %d 亰舒亞舒仍仂仄 (%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 仆仂于亳��, %d 仆亠仗��仂��亳��舒仆亳��, %d 亰舒亞舒仍仂仄"
@@ -6125,6 +6133,9 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "��亠于亟舒��舒 亰舒仗亳���� 于 %s.\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "��亠��亠弍��亟仂于����仄仂 于���� 亟亠��亠于舒 仗舒仗仂从..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/��亳亞仍�磲/��仂亟仂于舒 ��舒弍仍亳����/---"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ae8bf768..10ba2282 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: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+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"
@@ -62,11 +62,11 @@ msgstr ""
 "Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-"
 "1307, USA."
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "罩ｅ��莚糸��������絽��埇�����臀�...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -74,19 +74,19 @@ msgstr ""
 "筝�篋���医��腦���ｅ群���綣����\n"
 "���膽�莨�絽��垸��鐚�莚桁�渇�������������医��腦���ｃ��"
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "罩ｅ�����綣�絽��埇��莨�腦����...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "罩ｅ�����綮阪���埇��莨�腦����...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "膽�莨�絽����"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -94,8 +94,8 @@ msgstr ""
 "�����ц�ラ〆綺閈���ユ�育��篁吟�����筝����G���������紊����罅�鐚��������������･��金��\n"
 "��銀��罍���ユ�育��篁吟��"
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -103,60 +103,66 @@ msgstr ""
 msgid "Name"
 msgstr "���腱�"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "��顒�"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "�����≦��"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "羞糸��"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "膽�莨�"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr " ������ "
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "筝�腱�"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "筝�腱�"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr " 莅鞘減藥�莅ゅ����� "
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "���������荀������よ�ュ���垸��鐚�"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "������蘂�"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "�����ゅ�����"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "���������荀������よ�ュ���垸��鐚�"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "���"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+���"
 
@@ -225,7 +231,7 @@ msgstr " ������ "
 msgid "Abort"
 msgstr "膸�罩�"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -236,11 +242,11 @@ msgstr ""
 "(���%%h���絨�茴���炊�≫減������)\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "�����亥�������潔�����������"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -251,7 +257,7 @@ msgstr ""
 "(���%%u���絨�茴���炊�≫減������)\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "���篏���������桁�����"
 
@@ -259,7 +265,7 @@ msgstr "���篏���������桁�����"
 msgid "Add Address to Book"
 msgstr "絨���医��羞糸����医�医��膂�"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "��医��"
@@ -345,8 +351,8 @@ msgstr "/��医��(_A)/膽�莨�(_E)"
 msgid "/_Address/_Delete"
 msgstr "/��医��(_A)/������(_D)"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/綏ュ��(_T)"
 
@@ -354,13 +360,13 @@ msgstr "/綏ュ��(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/綏ュ��(_T)/絲弱��LDIF���篁�(_L)"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/絽����(_H)"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/絽����(_H)/��割��(_A)"
 
@@ -377,10 +383,10 @@ msgid "/New _Folder"
 msgstr "/��医産���篁九す(_F)"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -399,17 +405,17 @@ msgstr "/������(_D)"
 msgid "E-Mail address"
 msgstr "��球�����篁九�医��"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "��医��膂�"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "紮����鐚�"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -569,7 +575,7 @@ msgid "Group"
 msgstr "臂ょ��"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "���篁九す"
 
@@ -593,7 +599,7 @@ msgstr "��������医��"
 msgid "Personal address"
 msgstr "筝�篋阪�医��"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "羈����"
 
@@ -601,7 +607,7 @@ msgstr "羈����"
 msgid "Warning"
 msgstr "茘����"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "���莚�"
 
@@ -613,31 +619,31 @@ msgstr "罩ｅ�����綮堺�������∽�水�壕��罅�...\n"
 msgid "Show this message next time"
 msgstr "筝�罨∴����丞ず莚ヤ拭���"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "罘����"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "膾∵��"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "膣����"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "紊�������"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "������"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "膸粋��"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "罍����"
 
@@ -645,7 +651,7 @@ msgstr "罍����"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "羃≧��"
 
@@ -657,8 +663,8 @@ msgstr "/羞糸��(_A)..."
 msgid "/_Remove"
 msgstr "/������(_R)"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/絮����(_P)..."
 
@@ -818,8 +824,8 @@ msgstr "/��ョ��(_V)/���紊����(_R)"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/��ョ��(_V)/---"
 
@@ -845,7 +851,7 @@ msgstr "/��ョ��(_V)/絖�膃�膽����(_E)/������(_A)"
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 msgid "/_View/Character _encoding/---"
 msgstr "/��ョ��(_V)/絖�膃�膽����(_E)/---"
@@ -911,133 +917,138 @@ msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/��ョ��(_V)/絖�膃�膽����(_E)/膊�篏�筝���� (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
+#, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/��ョ��(_V)/絖�膃�膽����(_E)/膊�篏�筝���� (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/��ョ��(_V)/絖�膃�膽����(_E)/膵�篏�筝���� (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/��ョ��(_V)/絖�膃�膽����(_E)/膵�篏�筝���� (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/��ョ��(_V)/絖�膃�膽����(_E)/���蕾�莚� (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/��ョ��(_V)/絖�膃�膽����(_E)/羈医�処�� (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/��ョ��(_V)/絖�膃�膽����(_E)/羈医�処�� (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/綏ュ��(_T)/��医��膂�(_A)"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/綏ュ��(_T)/罔≧��(_T)"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/綏ュ��(_T)/���篏�(_N)"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/綏ュ��(_T)/---"
 
-#: src/compose.c:670
+#: src/compose.c:672
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/綏ュ��(_T)/���紊����膽�莨����膽�莨�(_X)"
 
-#: src/compose.c:674
+#: src/compose.c:676
 msgid "/_Tools/PGP Si_gn"
 msgstr "/綏ュ��(_T)/PGP 膈上��(_G)"
 
-#: src/compose.c:675
+#: src/compose.c:677
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/綏ュ��(_T)/PGP ���絲�(_E)"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s鐚����篁銀��絖����\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "���羈�緇���井�����������\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "綣�������莅井�弱�����莚����"
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "���篁九��紊�/莉������弱�����莚����"
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "���篁� %s 筝�絖����\n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "���羈��ｷ緇����篁� %s ���紊у��\n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "���篁� %s ���腥榊�����"
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "���羈�莚糸�� %s���"
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "���篁駈��%s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "���羈��ｷ緇����������篁句�����������"
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [綏牙��莨�]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - ��医�����篁�%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "��医�����篁�%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "羃≧�����絎���銀散篋冴��"
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "������"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "筝脂�����腥榊�����菴�荀����������鐚�"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "���羈��ｷ緇���銀散篋阪��茵����"
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1045,26 +1056,26 @@ msgstr ""
 "羃≧�����絎����������篁区��������絽��垩��\n"
 "莚桁�����������������筝�筝����篁九���垩��"
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "���������篁九�� %s ��九��������莚����"
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "���羈�絨�莚ラ��篁銀��絖���医��篁句�宴��"
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "���羈���上�医��綵�������筝����絲���ユ��莚����%s�����梧��膤紫����ュ�����"
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "���羈���劫�����篁九�����\n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1073,140 +1084,140 @@ msgstr ""
 "���羈�絨����篁句��絖�膃�膽����篁� %s 莉���√�� %s���\n"
 "篁���句�� %s ���������鐚�"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "���羈�������篁九ご\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "���羈������ゆ�ч��篁�\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "罩ｅ�����������篁�...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "���羈���上�育��������篁九す鐚�%s\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "���羈�������莚ラ��篁�\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "���������篁倶��莚��埦��%s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "罩ｅ�����綮堺�医��腦����...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME 膠糸��"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "紊у��"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "���篁銀査鐚�"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "腴���喝��������篁�"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "篁ュ��������"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "��上�ラ��������篁九す鐚����篁ュ��������"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "���腮�"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "篆�絖���域��腮炊��篁九す"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "������"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "�����ユ��篁九��絎�"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "���篁�"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "�����ラ��篁�"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "膈上��"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "�����ョ�上��"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "膽�莨����"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "篏睡��紊����膽�莨����膽�莨�"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "��∵��"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "��粋����∵��"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "���������MIME膠糸�����"
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "���篁銀��絖�������筝榊�冴��"
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "絮����"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "膽������劫��"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "莊�緇�"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "���篁九��"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "紊����膽�莨������巡擦茵�������鐚����%s���\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1217,71 +1228,71 @@ msgstr ""
 "綣阪�句�����腮�綺�鐚�\n"
 "腮�綺靳����莚��埦��%d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "綏牙�����腮�綺靳����莚��埦��%d"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "筝贋�倶��篁駈��%s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr "��医��鐚�篁�������菴�腮�筝�莨����\n"
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "���羈���ц��紊����膽�莨����\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "���羈������ユ��篁�\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "膊♂��莚糸��紊沿乾\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "���羈�絨�莚ラ��篁倶��������"
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 msgid "Select files"
 msgstr "���������篁�"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "���������篁�"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "筝√�����篁�"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "莚ラ��篁九群篆���鴻��筝√��絎�鐚�"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "筝√��"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "��上�ヨ��腮睡��"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "���荀�篏睡��罔≧�垂��%s������鐚�"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "篏睡��罔≧��"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "��炊��"
 
@@ -1442,12 +1453,12 @@ msgstr "膽�莨����篁九す"
 msgid "Input the new name of folder:"
 msgstr "莨���ユ��篁九す�����医��絖�鐚�"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "��医産���篁九す"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "莨���ユ�医産���篁九す������絖�鐚�"
 
@@ -1616,160 +1627,156 @@ msgstr "���羈������ラ��臀����篁�\n"
 msgid "Select folder"
 msgstr "���������篁九す"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "��銀散膊�"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "綏峨�����"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "������"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "綺�篁句��"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "���腮睡��"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "��井��篁九す"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "絖�膃����%c���筝���遵�����������篁九す���絖�筝����"
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "���篁九す���%s���綏峨��������"
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "���羈����綮堺��篁九す���%s������"
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/���綮堺�井��篁九す(_N)..."
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/�����遵�����篁九す(_R)..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/�����ゆ��篁九す(_D)"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 msgid "/Empty _trash"
 msgstr "/羝�腥阪��篁句��(_T)"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/罍���ユ�育��篁�(_C)"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/���綮堺��篁九す���(_E)"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/��ユ�冗��篁�(_S)..."
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 msgid "/Down_load"
 msgstr "/筝�莉�(_L)"
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/莅∫����育�紫��(_B)..."
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/�����ゆ�育�紫��(_R)"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "罩ｅ�����綮堺��篁九す茹����...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "��医産"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "���莚�"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "罩ｅ��莅丞舟���篁九す篆≧��...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "罩ｅ��莅丞舟���篁九す篆≧��..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "罩ｅ�����������篁九す %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "罩ｅ�����������篁九す %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "���綮堺��篁九す���"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "���篁九す���絨����綮冴��膸х鮫���鐚�"
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "罩ｅ�����綮堺��篁九す���..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 msgid "Rebuilding of the folder tree failed."
 msgstr "���綮堺��篁九す���紊沿乾���"
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "罩ｅ�����綮堺��篁九す���..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "罩ｅ��罍���ユ��������篁九す筝������育��篁�..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "���筝����篁九す %s\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "罩ｅ��筝�莉� %s 筝�������篁�..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "筝�莉盾��%s���筝�������篁倶�九��������莚����"
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1779,16 +1786,16 @@ msgstr ""
 "(絋�������荀����綮坂��筝�篆�絖�絖����篁九す������篁九す鐚�\n"
 "������絖����������羞糸�����/���)"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "莨���モ��%s��������医��絖�鐚�"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "�����遵�����篁銀散"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1797,24 +1804,24 @@ msgstr ""
 "���%s���筝�������������篁九す������篁九��茴������ゃ��\n"
 "���������荀������ゅ��鐚�"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "�����ゆ��篁九す"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "���羈������ゆ��篁九す���%s������"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "羝�腥阪��篁句��"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "羝�腥阪��篁句�演�����������篆＞散鐚�"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1823,34 +1830,34 @@ msgstr ""
 "������荀������ら��篁句�奄��%s���鐚�\n"
 "(���篁銀��篌�篁�脾����������)"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "�����ら��膊�"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "������荀������� IMAP4 絽��垨��%s���鐚�"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "������ IMAP4 絽����"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "������荀������ゆ�育�紫�����%s���鐚�"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "�����ゆ�育�紫��"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "�����域�������ゆ�育�紫��絽��垨��%s���鐚�"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "�����ゆ�育�紫��絽����"
 
@@ -1898,7 +1905,7 @@ msgstr "������"
 msgid "Can't retrieve newsgroup list."
 msgstr "���羈���������育�紫�����茵����"
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "絎�������"
 
@@ -2181,7 +2188,7 @@ msgstr "絲弱�� LDIF ���篁九�医�医��膂�"
 msgid "Prev"
 msgstr "筝�筝�筝�"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "筝�筝�筝�"
 
@@ -2271,7 +2278,7 @@ msgstr "罩ｅ��菴��･POP3�����≦��鐚�%s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "���羈�菴��･POP3�����≦��鐚�%s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "罩ｅ��薨�莚�..."
 
@@ -2301,7 +2308,7 @@ msgstr "罩ｅ���ｷ�����育��篁句��紊у��(LIST)..."
 msgid "Deleting message %d"
 msgstr "罩ｅ�������ら��篁� %d"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "罩ｅ��������"
 
@@ -2344,7 +2351,8 @@ msgstr "���羈������ユ��篁吟��"
 msgid "Socket error."
 msgstr "Socket���莚����"
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "菴�腮�筝紙�阪�渇��篋�菴��･���"
 
@@ -2361,11 +2369,11 @@ msgstr ""
 "篆∞�沿←���篏�鐚�\n"
 "%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "薨�莚�紊沿乾���"
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2374,7 +2382,7 @@ msgstr ""
 "薨�莚�紊沿乾鐚�\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr "篌�莚�莇���吟��"
 
@@ -2782,318 +2790,318 @@ msgstr "/��ョ��(_V)/絖�膃�膽����(_E)/��ヨ�� (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/��ョ��(_V)/絖�膃�膽����(_E)/��ヨ�� (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/��ョ��(_V)/絖�膃�膽����(_E)/筝���� (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/��ョ��(_V)/絖�膃�膽����(_E)/���蕾�莚� (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/��ョ��(_V)/�����亥����ｄ賢���綣�(_W)"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/��ョ��(_V)/���篁倶�����篁�(_A)"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/��ョ��(_V)/��丞ず���������篁九ご(_H)"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/��ョ��(_V)/��贋�井��荀�(_U)"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/���篁�(_M)"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 msgid "/_Message/Recei_ve"
 msgstr "/���篁�(_M)/�･���(_V)"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/���篁�(_M)/�･���(_V)/綵����絽����(_C)"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/���篁�(_M)/�･���(_V)/������絽����(_A)"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/���篁�(_M)/�･���(_V)/���羔�(_G)"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 msgid "/_Message/Recei_ve/---"
 msgstr "/���篁�(_M)/�･���(_V)/---"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/���篁�(_M)/������������筝�������篁�(_S)"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/���篁�(_M)/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/���篁�(_M)/��医����育��篁�(_N)"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/���篁�(_M)/���紊�(_R)"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/���篁�(_M)/���紊����(_Y)"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/���篁�(_M)/���紊����(_Y)/������篋�(_AL)"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/���篁�(_M)/���紊����(_Y)/���篁銀査(_S)"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/���篁�(_M)/���紊����(_Y)/���篁九��茵�(_L)"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/���篁�(_M)/莉����(_F)"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/���篁�(_M)/篏�筝咲��篁区習���(_W)"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/���篁�(_M)/���絎����(_T)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/���篁�(_M)/腱糸��(_O)..."
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/���篁�(_M)/紊����(_C)..."
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/���篁�(_M)/������(_D)"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/���篁�(_M)/���莅�(_M)"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/���篁�(_M)/���莅�(_M)/���莅�(_M)"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/���篁�(_M)/���莅�(_M)/���羔����莅�(_U)"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/���篁�(_M)/���莅�(_M)/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/���篁�(_M)/���莅�(_M)/���莅遺減���莚�(_E)"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/���篁�(_M)/���莅�(_M)/���莅遺減綏画��(_D)"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/���篁�(_M)/���莅�(_M)/���������莅遺減綏画��(_R)"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/���篁�(_M)/�����亥��莨�(_E)"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/綏ュ��(_T)/絨����篁銀査羞糸����医�医��膂推賢(_K)"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/綏ュ��(_T)/菴�羯ゆ��篁九す筝�������������篁�(_F)"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 msgid "/_Tools/Filter _selected messages"
 msgstr "/綏ュ��(_T)/菴�羯ら��筝�������篁�(_S)"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/綏ュ��(_T)/���綮肴��羯よ�����(_C)"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/綏ュ��(_T)/���綮肴��羯よ�����(_C)/������(_A)"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/綏ュ��(_T)/���綮肴��羯よ�����(_C)/������篁銀査(_F)"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/綏ュ��(_T)/���綮肴��羯よ�����(_C)/�����銀散篋�(_T)"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/綏ュ��(_T)/���綮肴��羯よ�����(_C)/���筝脂��(_S)"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/綏ュ��(_T)/�����ら��紊�������篁�(_P)"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/綏ュ��(_T)/��ц��(_X)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/綏ュ��(_T)/莅医��腦����(_L)"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/���臀�(_C)"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/���臀�(_C)/������薤����蕁�(_C)..."
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/���臀�(_C)/菴�羯よ�丞舟(_F)..."
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/���臀�(_C)/罔≧��(_T)..."
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/���臀�(_C)/���篏�(_A)..."
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/���臀�(_C)/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/���臀�(_C)/綵����絽��埌�����蕁�(_P)..."
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/���臀�(_C)/���綮堺�医�����(_N)..."
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/���臀�(_C)/膽�莨�絽����(_E)..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/���臀�(_C)/��劫��綵����絽����(_H)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/絽����(_H)/������(_M)"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/絽����(_H)/������(_M)/��沿��(_E)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/絽����(_H)/������(_M)/��ヨ��(_J)"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/絽����(_H)/絽梧�����蘂�(_F)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/絽����(_H)/絽梧�����蘂�(_F)/��沿��(_E)"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/絽����(_H)/絽梧�����蘂�(_F)/緇決��(_G)"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/絽����(_H)/絽梧�����蘂�(_F)/茱睡�����莚�(_S)"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/絽����(_H)/絽梧�����蘂�(_F)/羈�莚�(_F)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/絽����(_H)/絽梧�����蘂�(_F)/��鎀у��莚�(_I)"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/絽����(_H)/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "罩ｅ�����綮坂源腦����...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "筝紫����ｏ��������蘂���� %d 紊沿乾\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "絎�������\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "������蘂�"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "���"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "罩ｅ�����腦���ｅ�������劫�鋌� %d ��劫�� %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr "胼紫鎖"
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr "���紊�篋�胼紫鎖��倶����������√�医��膾睡�倶�����鐚�"
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 msgid "Empty all trash"
 msgstr "羝�腥堺�����綺�篁句��"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 msgid "Empty messages in all trash?"
 msgstr "羝�腥堺�����綺�篁句�演�����篆＞散鐚�"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "羞糸�����膊�"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3102,16 +3110,16 @@ msgstr ""
 "莨���ラ��膊延��臀����\n"
 "絋�������絎�篋�綏峨�����������膊縁��絎�絨�茴����������������"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "���膊奄��%s���綏牙�鎕�������"
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "���膊�"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3120,141 +3128,141 @@ msgstr ""
 "���綮咲��篁句�怨け茣ャ��\n"
 "箙�莅御��篋����篁九群膸鎕����鐚����������羃≧��������������"
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed鐚����篁九す茹����"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed鐚����篁区�����"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/���紊�(_R)"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 msgid "/Reply to _all"
 msgstr "/���紊���井�����篋�(_A)"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 msgid "/Reply to _sender"
 msgstr "/���紊���医��篁銀査(_S)"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 msgid "/Reply to mailing _list"
 msgstr "/���紊���育��篁九��茵�(_L)"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/莉����(_F)"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/篏�筝咲��篁区習���(_W)"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/���絎����(_T)"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "�･���"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "���綛倶�育��篁�"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "�������･���"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "���綛倶�����絽��埇����育��篁�"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "������������筝�������篁�"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "��医��"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "��医����育��篁�"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "���紊�"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "���紊�莚ラ��篁�"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "���������紊�"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "���紊�膸�������篋�"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "莉����"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "莉����莚ラ��篁�"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "�����よ�ラ��篁�"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "��ц��"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "��ц�����莅亥��紊����"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "筝�筝�筝����莚紫�����篁�"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "薤����蕁�"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "������薤����蕁�"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "絽����"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "絽��埈�丞舟"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr "���紊�篋�胼紫鎖��倶����������糸�丈�������√�医��膾睡�倶�����"
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr "���紊�篋����膾睡�倶����������糸�丈�������√�亥�紫鎖��倶�����"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "������"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "荀������堺��腮�綺����鐚�"
 
@@ -3376,28 +3384,28 @@ msgstr "綏我�ユ�上�育��篁句��絨常��篁�綣�紊雁薩膸�鐚�"
 msgid "Search finished"
 msgstr "���膣∝�����"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "罩ｅ�����綮咲��篁区�����...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "������"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "���篁�"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "���羈�篆�絖����篁金��%s���'���"
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "������"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3406,7 +3414,7 @@ msgstr ""
 "莨���ユ����医�巡擦茵�鐚�\n"
 "(���%s���絨�茴���炊�≫減���篁九��)"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3843,7 +3851,7 @@ msgstr "筝�莉醇����≦��筝�������������篁�"
 msgid "Receive size limit"
 msgstr "�･��九ぇ絨�������"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr "KB"
 
@@ -3863,7 +3871,7 @@ msgstr "(羃≧��菴�羯ょ�����篁銀��篆�絖����莚ユ��篁九す筝�)"
 msgid "Authentication method"
 msgstr "薨�莚���号��"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "������"
 
@@ -3887,7 +3895,7 @@ msgstr "���������篁倶��莚�"
 msgid "Add user-defined header"
 msgstr "羞糸�������桁��箙����紊翫��"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr " 膽�莨�... "
 
@@ -4355,157 +4363,162 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "膊�篏�筝���� (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "膊�篏�筝���� (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "膵�篏�筝���� (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "膵�篏�筝���� (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "筝���� (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "���蕾���� (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "羈井�� (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "羈井�� (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr "絋����������������������鐚�絨�篏睡�����������綵������阪��莅丞舟���膽������劫�����"
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "篌�莨�膽����"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr "���絎�綵����篁九��絎劫�������� ASCII 絖�膃���銀戎������ Content-Transfer-Encoding���"
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "膈上��������膃�"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "������������"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "������������紊����膽�莨����"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "��ら��罨≧��"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "���篁倶��茵�篋�膃�"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "筝�絖�膃�"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "綣�������茵�"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "莨���ユ�倶��茵�"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "������������茵�"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "���������������紊�������絽����"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "���紊���九�����������"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "���紊�������篌����紊���育��篁九��茵�"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "���紊���弱��"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "綣����膃����"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "莉������弱��"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr " 膃��垽�颷� "
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "絖�篏�"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "膺肢�����篁九ご���(絋�������篁銀査鐚����������筝脂��鐚����)"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "������篁九す��������丞ず���莚脂��篁句����育��"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "膽������育�紫����推��"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "篆＞散"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "���荀�茹����"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "絋�������篁銀査���������綏縁��������篁銀査�����鋇���丞ず��������銀散篋�"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "絮�綣�膾睡刈"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "��ユ����弱��"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr " 莅丞舟���荀�筝���丞ず���蕁�... "
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "���������篁句��蘂���画；腓�"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4513,320 +4526,320 @@ msgstr ""
 "������絖����絖�膃���丞ず紊�絖����絖�罸������医��\n"
 "(篁�������篋���ヨ��)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "������篁区����鞘��筝���丞ず���篁九ご��∽��"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "������篁区����鞘賢��丞ず膊����������篁九ご"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr "絨�HTML���絎号�丞ず筝堺�����"
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "���篁九��絎壕����頑��"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "筝���靘�"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "羯����"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "���蕁究�����"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "綛恰��羯����"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "罸閩≧�����"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr "��上��"
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr "絨����篁銀賢�����上�靶���乗�渇�����腦���ｅぇ絨�"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 msgid "Display images as inline"
 msgstr "綉���ユ�丞ず��上��"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "������罍���ョ�上��"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "���綣劫�榊����ｄ賢��丞ず膈上��罍���ョ�����"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "絨���ｄ擦筝俄鹸��九����上�����絖�筝�"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "菴������狗��"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "���������"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "莅丞舟筝財��0���絨������岩肩篌�莚�菴�腮�筝����絖���ｄ擦筝�"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "莨���ュ�ｄ擦筝我�倶���ｷ莨����(��翫�����)"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "絋���� GnuPG ���羈�綏ヤ��鐚������������倶�丞ず茘����"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "������荀�腦���ｄ賢���������篁倶�倶��綣����篁�"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "菴���ユ��篁九す��倶��綣�膃�筝�筝����莚紫�����篁�"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "篁������亥����ｄ賢���綣����篁倶�倶��莅育��篁銀減綏画��"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "��九�井�育��篁倶�区習��井�銀散膊�"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "綵�腱糸����������ら��篁倶�句����恰�ц��"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "絋����莚ラ��蕁劫�渇��鐚����莅育��篁句�翫�医�������ц�����"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "��九�壕��罅�"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "��丞ず�･��九�壕��罅�"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "��紙��"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr "篁�������綏ユ･��倶��"
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "篁�筝�"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "����･��狗��莚���銀��綣劫�咲��莚�絲壕��罅�"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "絎���������渇���･��九�壕��罅�"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr " 莅丞舟��������活��... "
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "紊������巡擦 (%s 絨�茴���炊�≫減���篁九�����URI)"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "臀�蕁究�頵����"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "�����紙�九����医��羞糸��筝堺�銀散篋�"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "�����榊��綺����"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "�����堺�区��茵�隋�莅�"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "�����堺�倶��腥阪��篁句��"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "���羝�腥阪��莚∫��"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "絋����������筝�������篁九葦�����肴�����"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "絅��･絖� I/O 莇���駈��"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "腱�"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "膽����������������"
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "絎���雁�����������"
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "膽����������篁遵��"
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "絎���雁�����篁遵��"
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "綵������阪��莅丞舟薤���������ユ�������狗�贋�弱��"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "筝�膾�(綛岩蚕/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "���菴���区；腓榊�����筝����紊����"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24絨���倶�狗��������菴���九�����"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12絨���倶�狗��������菴���九�����"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "���菴���区；腓榊��筝�綛岩賢���紊����"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "���菴���区；腓榊�����篁�"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "���菴���区；腓榊��紊����"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "AM���PM"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "���菴���区；腓榊��腱�"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "���菴���区；腓榊��������筝����紊����"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "綵������阪��莅丞舟���薤������ユ����弱��"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "綛岩蚕���������筝や肩��医��"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "���菴���句��綛岩蚕"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "��九�冴�����絖����膽����"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "莚贋��膃�"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "��颷�"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "腓坂��"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "莅丞舟���篁狗�����"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "蘂����"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "綣����鐚�膃�筝�膾�"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "綣����鐚�膃�篋�膾�"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "綣����鐚�膃�筝�膾�"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "URI ��丈･"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "緇��ｯ篏睡��綣����蘂����"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "������綣����膾у�� 1 ���蘂����"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "������綣����膾у�� 2 ���蘂����"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "������綣����膾у�� 3 ���蘂����"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "������URI���蘂����"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "膃��埇����颷�"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4850,11 +4863,11 @@ msgstr ""
 "��育�紫��\n"
 "���篁倶��莚����"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "絋���� x 莅丞舟篋���弱����丞ず expr"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4868,7 +4881,7 @@ msgstr ""
 "羃≧��膈上�����綣�������絎�\n"
 "%"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4880,15 +4893,15 @@ msgstr ""
 "綏�������\n"
 "�勄�����"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "絖�篏�������"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "��������活��"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4898,11 +4911,11 @@ msgstr ""
 "���箙����篁ュ��藜������上��������蕁剛��綛倶��筝�篁私�����\n"
 "(���膸�������)��ヤ信��壕�����綽���潔�����"
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "藥�莅�"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "�����Sylpheed"
 
@@ -4970,190 +4983,185 @@ msgstr "菴�羯よ�上��"
 msgid "Enabled"
 msgstr "綏峨�����"
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "���隋�絎�荀������よ�ヨ��������鐚�"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "������蘂�"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "�����よ�����"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 msgid "Filter rule"
 msgstr "菴�羯よ�����"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr "絋����篁ヤ��篁私����＞散羯∴恭"
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr "絋����篁ヤ����������＞散羯∴恭"
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr "��ц��筝�������篏�鐚�"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr "��銀散篋堺��������"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 msgid "Any header"
 msgstr "篁私�����篁九ご"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 msgid "Edit header..."
 msgstr "膽�莨����篁九ご..."
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 msgid "Message body"
 msgstr "���篁九��絎�"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr "��巡擦膸����"
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr "���篁倶�狗��"
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "������"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 msgid "doesn't contain"
 msgstr "筝�������"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr "���"
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr "筝����"
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr "��拷��罩ｅ��茵�莨上��"
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr "筝���拷��罩ｅ��茵�莨上��"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr "紊т��"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr "絨鋋�"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr "��推��"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr "���篋�"
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "腱糸��"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 msgid "Copy to"
 msgstr "紊���九��"
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "筝��･���"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 msgid "Delete from server"
 msgstr "篁������≦��筝�������"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 msgid "Set mark"
 msgstr "莅丞舟���莅�"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 msgid "Set color"
 msgstr "莅丞舟蘂����"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 msgid "Mark as read"
 msgstr "���莅遺減綏画��"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 msgid "Forward as attachment"
 msgstr "篏�筝咲��篁区習���"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 msgid "Redirect"
 msgstr "���絎����"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 msgid "Execute command"
 msgstr "��ц����巡擦"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr "���罩√�拷��茹����"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 msgid "folder:"
 msgstr "���篁九す鐚�"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 msgid "address:"
 msgstr "��医��鐚�"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 msgid "Edit header list"
 msgstr "膽�莨����篁九ご���茵�"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 msgid "Headers"
 msgstr "���篁九ご"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 msgid "Header:"
 msgstr "���篁九ご鐚�"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 msgid "Rule name is not specified."
 msgstr "羃≧�����絎�茹�������腱違��"
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 msgid "Command is not specified."
 msgstr "羃≧�����絎���巡擦茵����"
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr "絖���������������＞散���"
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 msgid "Destination folder is not specified."
 msgstr "羃≧�����絎����������篁九す���"
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr "絖����������������篏����"
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 msgid "Condition not exist."
 msgstr "筝�絖���������＞散���"
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 msgid "Action not exist."
 msgstr "筝�絖����������篏����"
 
@@ -5412,56 +5420,56 @@ msgstr "罩ｅ��菴��･"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "罩ｅ��菴��･SMTP�����≦��鐚�%s ..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "罩ｅ�������� HELO..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "罩ｅ��薨�莚�"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "罩ｅ�����������篁�..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "罩ｅ�������� EHLO..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "罩ｅ�������� MAIL FROM..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "罩ｅ��������"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "罩ｅ�������� RCPT TO..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "罩ｅ�������� DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "罩ｅ��������..."
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "罩ｅ�����������篁� (%d / %d 絖����)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "罩ｅ�����������篁�"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "���������篁倶�九��������莚����"
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5765,120 +5773,120 @@ msgstr "No."
 msgid "Creating summary view...\n"
 msgstr "罩ｅ�����綮堺��荀�茹����...\n"
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "紊�������綽�"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "���筝�篋����篏����莅違��紊�������鐚�"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "罩ｅ�����������篁九す (%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "羃≧�����莚脂��篁�"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "羃≦���ｰ���莚脂��篁吟��篁������√��紮���ユ�常��"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "羃≧�����莚脂��篁�"
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "羃≦���ｰ���莚脂��篁吟����遺��筝�筝����篁九す鐚�"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "���罨≧�ユ��"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "羃≧����育��篁�"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "羃≦���ｰ��育��篁吟��篁������√��紮���ユ�常��"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "羃≧����育��篁�"
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "羃≦���ｰ��育��篁吟����遺��筝�筝����篁九す鐚�"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "羃≧�����莅域��������篁�"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "羃≧�����莅域��������篁吟��篁������√��紮���ユ�常��"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "羃≧�����莅域��������篁�"
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "羃≧�����莅域��������篁吟��篁������√��紮���ユ�常��"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "羃≧����上�亥��蘂���我��羈�菴�������篁�"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "羃≧����上�亥��蘂���我��羈�菴�������篁吟��篁������√��紮���ユ�常��"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "羃≧�����蘂���我��羈�������篁吟��"
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "羃≧����上�亥��蘂���我��羈�菴�������篁吟��篁������√��紮���ユ�常��"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "罩ｅ��������蘂�綵�膠脂��篁�..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "�����や�� %d 筝����篁�"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "腱糸��篋� %s%d"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr "鐚�"
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "紊���銀�� %s%d"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr " 蕁壕←���筝�"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 筝���育��篁駈��%d 筝����莚脂��篁駈����� %d 筝����篁�(%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 筝���育��篁狗��篁駈��%d 筝����莚脂��篁駈����� %d 筝����篁�"
@@ -6049,6 +6057,9 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "������ %s ��九け茣ャ��\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "罩ｅ�����綮堺��篁九す���..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/��ョ��(_V)/絖�膃����(_C)/---"
 
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index 2764c9bb..5a34dd27 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-31 13:11+0900\n"
+"POT-Creation-Date: 2005-04-12 16:48+0900\n"
 "PO-Revision-Date: 2004-12-04 08:24+0800\n"
 "Last-Translator: Frank J. J. Weng <franklin@goodhorse.idv.tw>\n"
 "Language-Team: zh-l10n <zh-l10n@linux.org.tw>\n"
@@ -49,11 +49,11 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/account.c:121
+#: src/account.c:137
 msgid "Reading all config for each account...\n"
 msgstr "莅����������絽活�����荐�絎�筝�...\n"
 
-#: src/account.c:341
+#: src/account.c:357
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -61,19 +61,19 @@ msgstr ""
 "���罩ｅ����医����灸散鐚�\n"
 "茫���������������医��筝������灸散�����画��絽活��荐�絎����"
 
-#: src/account.c:347
+#: src/account.c:363
 msgid "Opening account edit window...\n"
 msgstr "������絽活��膩�莠�荀�腦�筝�...\n"
 
-#: src/account.c:596
+#: src/account.c:614
 msgid "Creating account edit window...\n"
 msgstr "��∝��絽活��膩�莠�荀�腦�筝�...\n"
 
-#: src/account.c:601
+#: src/account.c:619
 msgid "Edit accounts"
 msgstr "膩�莠�絽活��荐�絎�"
 
-#: src/account.c:619
+#: src/account.c:637
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -81,8 +81,8 @@ msgstr ""
 "罟∽�ユ�育�灸散���絨����箴���т����∝�����綺����������篁ュ�冗�� G 罨�篏�筝������劫��鐚�\n"
 "箴�羆阪��������������������罟∽�ャ�����荀�罟∽�ヨ�峨験��������灸散���"
 
-#: src/account.c:639 src/addressadd.c:186 src/addressbook.c:488
-#: src/compose.c:3803 src/editaddress.c:195 src/editaddress.c:936
+#: src/account.c:691 src/addressadd.c:186 src/addressbook.c:488
+#: src/compose.c:3809 src/editaddress.c:195 src/editaddress.c:936
 #: src/editaddress.c:984 src/editbook.c:191 src/editgroup.c:257
 #: src/editjpilot.c:296 src/editldap.c:300 src/editvcard.c:211
 #: src/mimeview.c:151 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -90,60 +90,66 @@ msgstr ""
 msgid "Name"
 msgstr "���腮�"
 
-#: src/account.c:640 src/prefs_account.c:833
+#: src/account.c:696 src/prefs_account.c:833
 msgid "Protocol"
 msgstr "���荐����絎�"
 
-#: src/account.c:641
+#: src/account.c:701
 msgid "Server"
 msgstr "篌堺�����"
 
-#: src/account.c:670 src/addressbook.c:628 src/editaddress.c:884
+#: src/account.c:716 src/addressbook.c:628 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:251 src/prefs_customheader.c:235
 #: src/prefs_display_header.c:269 src/prefs_display_header.c:324
-#: src/prefs_filter_edit.c:1548
+#: src/prefs_filter_edit.c:1570
 msgid "Add"
 msgstr "��医��"
 
-#: src/account.c:676 src/prefs_filter.c:319
+#: src/account.c:722 src/prefs_filter.c:320
 msgid "Edit"
 msgstr "膩�莠�"
 
-#: src/account.c:682 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1551
+#: src/account.c:728 src/prefs_customheader.c:241 src/prefs_filter_edit.c:1573
 msgid " Delete "
 msgstr "������"
 
-#: src/account.c:688 src/prefs_actions.c:312 src/prefs_customheader.c:287
+#: src/account.c:734 src/prefs_actions.c:312 src/prefs_customheader.c:287
 #: src/prefs_display_header.c:288 src/prefs_summary_column.c:283
 msgid "Down"
 msgstr "���筝�"
 
-#: src/account.c:694 src/prefs_actions.c:306 src/prefs_customheader.c:281
+#: src/account.c:740 src/prefs_actions.c:306 src/prefs_customheader.c:281
 #: src/prefs_display_header.c:282 src/prefs_summary_column.c:279
 msgid "Up"
 msgstr "���筝�"
 
-#: src/account.c:708
+#: src/account.c:754
 msgid " Set as default account "
 msgstr "荐���咲��荐�絽活��"
 
-#: src/account.c:757
+#: src/account.c:807
+#, fuzzy, c-format
+msgid "Do you really want to delete the account '%s'?"
+msgstr "���腆阪��荀������ら�����絽活�����鐚�"
+
+#: src/account.c:809 src/prefs_filter.c:759
+#, fuzzy
+msgid "(Untitled)"
+msgstr "��≧��蕁�"
+
+#: src/account.c:810
 msgid "Delete account"
 msgstr "�����ゅ験���"
 
-#: src/account.c:758
-msgid "Do you really want to delete this account?"
-msgstr "���腆阪��荀������ら�����絽活�����鐚�"
-
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "Yes"
 msgstr "������"
 
-#: src/account.c:759 src/compose.c:2685 src/compose.c:4998
-#: src/folderview.c:1916 src/folderview.c:1998 src/folderview.c:2034
-#: src/folderview.c:2156 src/folderview.c:2192
+#: src/account.c:811 src/compose.c:2687 src/compose.c:5004
+#: src/folderview.c:1968 src/folderview.c:2061 src/folderview.c:2105
+#: src/folderview.c:2243 src/folderview.c:2287
 msgid "+No"
 msgstr "+筝�荀�"
 
@@ -212,7 +218,7 @@ msgstr "������"
 msgid "Abort"
 msgstr "���羔�"
 
-#: src/action.c:1291
+#: src/action.c:1294
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -223,11 +229,11 @@ msgstr ""
 "鐚�'%%h' ���茴�臀������肴�峨����醐��\n"
 "  %s"
 
-#: src/action.c:1296
+#: src/action.c:1299
 msgid "Action's hidden user argument"
 msgstr "篏睡�����荐�絎���沿�鋈���巡擦������"
 
-#: src/action.c:1300
+#: src/action.c:1303
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -238,7 +244,7 @@ msgstr ""
 "鐚�'%%u' ���茴�臀������肴�峨����醐��\n"
 "  %s"
 
-#: src/action.c:1305
+#: src/action.c:1308
 msgid "Action's user argument"
 msgstr "篏睡�����荐�絎�箙���巡擦������"
 
@@ -246,7 +252,7 @@ msgstr "篏睡�����荐�絎�箙���巡擦������"
 msgid "Add Address to Book"
 msgstr "絨�篏���������ヤ�����膂�"
 
-#: src/addressadd.c:196 src/compose.c:4347 src/editaddress.c:196
+#: src/addressadd.c:196 src/compose.c:4353 src/editaddress.c:196
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "篏����"
@@ -332,8 +338,8 @@ msgstr "/篏����(_A)/膩�莠�(_E)"
 msgid "/_Address/_Delete"
 msgstr "/篏����(_A)/������(_D)"
 
-#: src/addressbook.c:356 src/compose.c:665 src/mainwindow.c:697
-#: src/messageview.c:246
+#: src/addressbook.c:356 src/compose.c:667 src/mainwindow.c:699
+#: src/messageview.c:248
 msgid "/_Tools"
 msgstr "/綏ュ��(_T)"
 
@@ -341,13 +347,13 @@ msgstr "/綏ュ��(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/綏ュ��(_T)/������ LDIF 罟�(_L)"
 
-#: src/addressbook.c:358 src/compose.c:678 src/mainwindow.c:742
-#: src/messageview.c:264
+#: src/addressbook.c:358 src/compose.c:680 src/mainwindow.c:744
+#: src/messageview.c:266
 msgid "/_Help"
 msgstr "/茯����(_H)"
 
-#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:753
-#: src/messageview.c:265
+#: src/addressbook.c:359 src/compose.c:681 src/mainwindow.c:755
+#: src/messageview.c:267
 msgid "/_Help/_About"
 msgstr "/茯����(_H)/������(_A)"
 
@@ -364,10 +370,10 @@ msgid "/New _Folder"
 msgstr "/��医��莖����紊�(_F)"
 
 #: src/addressbook.c:381 src/addressbook.c:391 src/compose.c:472
-#: src/folderview.c:220 src/folderview.c:222 src/folderview.c:226
-#: src/folderview.c:236 src/folderview.c:238 src/folderview.c:240
-#: src/folderview.c:244 src/folderview.c:254 src/folderview.c:256
-#: src/folderview.c:259 src/summaryview.c:346 src/summaryview.c:350
+#: src/folderview.c:219 src/folderview.c:221 src/folderview.c:225
+#: src/folderview.c:235 src/folderview.c:237 src/folderview.c:239
+#: src/folderview.c:243 src/folderview.c:253 src/folderview.c:255
+#: src/folderview.c:258 src/summaryview.c:346 src/summaryview.c:350
 #: src/summaryview.c:354 src/summaryview.c:364 src/summaryview.c:366
 #: src/summaryview.c:369 src/summaryview.c:375
 msgid "/---"
@@ -386,17 +392,17 @@ msgstr "/������(_D)"
 msgid "E-Mail address"
 msgstr "E-Mail篏����"
 
-#: src/addressbook.c:493 src/compose.c:4348 src/prefs_common.c:2207
+#: src/addressbook.c:493 src/compose.c:4354 src/prefs_common.c:2208
 msgid "Address book"
 msgstr "篏����膂�"
 
-#: src/addressbook.c:593 src/prefs_filter_edit.c:353
+#: src/addressbook.c:593 src/prefs_filter_edit.c:362
 msgid "Name:"
 msgstr "紮����鐚�"
 
 #. Buttons
 #: src/addressbook.c:625 src/addressbook.c:1665 src/addressbook.c:1671
-#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2221
+#: src/editaddress.c:878 src/editaddress.c:1011 src/mainwindow.c:2223
 #: src/prefs_actions.c:263 src/prefs_display_header.c:275
 #: src/prefs_display_header.c:330 src/prefs_template.c:227
 msgid "Delete"
@@ -560,7 +566,7 @@ msgid "Group"
 msgstr "臂ょ��"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3133 src/folderview.c:283 src/prefs_account.c:1824
+#: src/addressbook.c:3133 src/folderview.c:328 src/prefs_account.c:1824
 msgid "Folder"
 msgstr "莖����紊�"
 
@@ -584,7 +590,7 @@ msgstr "��援��篏����膣����"
 msgid "Personal address"
 msgstr "腱�篋坂�����膣����"
 
-#: src/alertpanel.c:123 src/compose.c:4998 src/main.c:458
+#: src/alertpanel.c:123 src/compose.c:5004 src/main.c:458
 msgid "Notice"
 msgstr "羈����"
 
@@ -592,7 +598,7 @@ msgstr "羈����"
 msgid "Warning"
 msgstr "茘����"
 
-#: src/alertpanel.c:149 src/compose.c:2685 src/inc.c:558
+#: src/alertpanel.c:149 src/compose.c:2687 src/inc.c:558
 msgid "Error"
 msgstr "���茯�"
 
@@ -604,31 +610,31 @@ msgstr "��∝��茘����絨�荅掩��筝�... \n"
 msgid "Show this message next time"
 msgstr "筝�罨≦�����������"
 
-#: src/colorlabel.c:45
+#: src/colorlabel.c:46
 msgid "Orange"
 msgstr "罘����"
 
-#: src/colorlabel.c:46
+#: src/colorlabel.c:47
 msgid "Red"
 msgstr "膣����"
 
-#: src/colorlabel.c:47
+#: src/colorlabel.c:48
 msgid "Pink"
 msgstr "膕�膣����"
 
-#: src/colorlabel.c:48
+#: src/colorlabel.c:49
 msgid "Sky blue"
 msgstr "紊�������"
 
-#: src/colorlabel.c:49
+#: src/colorlabel.c:50
 msgid "Blue"
 msgstr "������"
 
-#: src/colorlabel.c:50
+#: src/colorlabel.c:51
 msgid "Green"
 msgstr "膓����"
 
-#: src/colorlabel.c:51
+#: src/colorlabel.c:52
 msgid "Brown"
 msgstr "罍����"
 
@@ -636,7 +642,7 @@ msgstr "罍����"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
-#: src/colorlabel.c:283 src/prefs_folder_item.c:285 src/summaryview.c:3580
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3580
 msgid "None"
 msgstr "���"
 
@@ -648,8 +654,8 @@ msgstr "/��医��...(_A)"
 msgid "/_Remove"
 msgstr "/������(_R)"
 
-#: src/compose.c:473 src/folderview.c:228 src/folderview.c:246
-#: src/folderview.c:261
+#: src/compose.c:473 src/folderview.c:227 src/folderview.c:245
+#: src/folderview.c:260
 msgid "/_Properties..."
 msgstr "/��у��...(_P)"
 
@@ -809,8 +815,8 @@ msgstr "/蕁�腓�(_V)/���荀�(_R)"
 
 #: src/compose.c:587 src/compose.c:589 src/compose.c:591 src/compose.c:593
 #: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:541
-#: src/mainwindow.c:565 src/mainwindow.c:650 src/mainwindow.c:654
-#: src/messageview.c:223
+#: src/mainwindow.c:565 src/mainwindow.c:652 src/mainwindow.c:656
+#: src/messageview.c:225
 msgid "/_View/---"
 msgstr "/蕁�腓�(_V)/---"
 
@@ -837,7 +843,7 @@ msgstr ""
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:624 src/compose.c:628 src/compose.c:632 src/compose.c:642
-#: src/compose.c:646 src/compose.c:654 src/compose.c:658 src/mainwindow.c:568
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/mainwindow.c:568
 #: src/mainwindow.c:575 src/messageview.c:150
 #, fuzzy
 msgid "/_View/Character _encoding/---"
@@ -920,137 +926,142 @@ msgstr "/蕁�腓�(_V)/絖����(_C)/膂♂��筝���� (_GB2312)"
 
 #: src/compose.c:650 src/mainwindow.c:628 src/messageview.c:203
 #, fuzzy
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/蕁�腓�(_V)/絖����(_C)/膂♂��筝���� (_GB2312)"
+
+#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/蕁�腓�(_V)/絖����(_C)/膵�蕭�筝���� (_Big5)"
 
-#: src/compose.c:652 src/mainwindow.c:630 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:632 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/蕁�腓�(_V)/絖����(_C)/膵�蕭�筝���� (EUC-_TW)"
 
-#: src/compose.c:656 src/mainwindow.c:636 src/messageview.c:210
+#: src/compose.c:658 src/mainwindow.c:638 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/蕁�腓�(_V)/絖����(_C)/������ (EUC-_KR)"
 
-#: src/compose.c:660 src/mainwindow.c:642 src/messageview.c:215
+#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/蕁�腓�(_V)/絖����(_C)/羈井�� (TIS-620)"
 
-#: src/compose.c:662 src/mainwindow.c:644 src/messageview.c:217
+#: src/compose.c:664 src/mainwindow.c:646 src/messageview.c:219
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/蕁�腓�(_V)/絖����(_C)/羈井�� (Windows-874)"
 
-#: src/compose.c:666 src/mainwindow.c:698 src/messageview.c:247
+#: src/compose.c:668 src/mainwindow.c:700 src/messageview.c:249
 msgid "/_Tools/_Address book"
 msgstr "/綏ュ��(_T)/篏����膂�(_A)"
 
-#: src/compose.c:667
+#: src/compose.c:669
 msgid "/_Tools/_Template"
 msgstr "/綏ュ��(_T)/絅����篆＞散罔ｆ��(_T)"
 
-#: src/compose.c:668 src/mainwindow.c:716 src/messageview.c:262
+#: src/compose.c:670 src/mainwindow.c:718 src/messageview.c:264
 msgid "/_Tools/Actio_ns"
 msgstr "/綏ュ��(_T)/��決��紊�������篁�(_n)"
 
-#: src/compose.c:669 src/compose.c:673 src/mainwindow.c:701
-#: src/mainwindow.c:715 src/mainwindow.c:717 src/mainwindow.c:720
-#: src/mainwindow.c:722 src/messageview.c:250 src/messageview.c:261
+#: src/compose.c:671 src/compose.c:675 src/mainwindow.c:703
+#: src/mainwindow.c:717 src/mainwindow.c:719 src/mainwindow.c:722
+#: src/mainwindow.c:724 src/messageview.c:252 src/messageview.c:263
 msgid "/_Tools/---"
 msgstr "/綏ュ��(_T)"
 
-#: src/compose.c:670
+#: src/compose.c:672
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/綏ュ��(_T)/篏睡����銀�����膩�莠����(_x)"
 
-#: src/compose.c:674
+#: src/compose.c:676
 msgid "/_Tools/PGP Si_gn"
 msgstr "/綏ュ��(_T)/PGP 膂順��(_g)"
 
-#: src/compose.c:675
+#: src/compose.c:677
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/綏ュ��(_T)/PGP ���絲�(_E)"
 
-#: src/compose.c:880
+#: src/compose.c:882
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 罟�罅�筝�絖����\n"
 
-#: src/compose.c:979 src/compose.c:1038 src/procmsg.c:1336
+#: src/compose.c:981 src/compose.c:1040 src/procmsg.c:1336
 msgid "Can't get text part\n"
 msgstr "羃�������絖�\n"
 
-#: src/compose.c:1426
+#: src/compose.c:1428
 msgid "Quote mark format error."
 msgstr "綣�荐���弱�����茯ゃ��"
 
-#: src/compose.c:1438
+#: src/compose.c:1440
 msgid "Message reply/forward format error."
 msgstr "���荀�/莉�絲�篆＞散��弱�����茯ゃ��"
 
-#: src/compose.c:1765
+#: src/compose.c:1767
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "罟�罅� %s 筝�絖���� \n"
 
-#: src/compose.c:1769
+#: src/compose.c:1771
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "��≧�����緇�罟�罅� %s ���紊у�� \n"
 
-#: src/compose.c:1773
+#: src/compose.c:1775
 #, c-format
 msgid "File %s is empty."
 msgstr "罟�罅� %s ���腥榊�����"
 
-#: src/compose.c:1777
+#: src/compose.c:1779
 #, c-format
 msgid "Can't read %s."
 msgstr "��≧��莅���� %s���"
 
-#: src/compose.c:1812
+#: src/compose.c:1814
 #, c-format
 msgid "Message: %s"
 msgstr "篆＞散鐚�%s"
 
-#: src/compose.c:1883 src/mimeview.c:491
+#: src/compose.c:1885 src/mimeview.c:491
 msgid "Can't get the part of multipart message."
 msgstr "��≧�����緇�������������罟����"
 
-#: src/compose.c:2317
+#: src/compose.c:2319
 msgid " [Edited]"
 msgstr " [綏俄信���]"
 
-#: src/compose.c:2319
+#: src/compose.c:2321
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - ��育�灸散%s"
 
-#: src/compose.c:2322
+#: src/compose.c:2324
 #, c-format
 msgid "Compose message%s"
 msgstr "��育�灸散%s"
 
-#: src/compose.c:2433
+#: src/compose.c:2435
 msgid "Recipient is not specified."
 msgstr "羃�������絎���銀散篋冴��"
 
-#: src/compose.c:2441 src/compose.c:4268 src/mainwindow.c:2153
+#: src/compose.c:2443 src/compose.c:4274 src/mainwindow.c:2155
 #: src/prefs_account.c:703 src/prefs_common.c:854
 msgid "Send"
 msgstr "������"
 
-#: src/compose.c:2442
+#: src/compose.c:2444
 msgid "Subject is empty. Send it anyway?"
 msgstr "羃����罔�蕁����腆阪��荀������削��"
 
-#: src/compose.c:2493
+#: src/compose.c:2495
 msgid "can't get recipient list."
 msgstr "��≧�����緇���銀散篋堺����銀散��域��臂ょ�����������"
 
-#: src/compose.c:2513
+#: src/compose.c:2515
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1058,26 +1069,26 @@ msgstr ""
 "�����悟�����絽活��筝����筝������糸����灸散絽活��鐚������醇�����箴������域��臂ょ��筝���取；���腴����������\n"
 "荀���守����灸散茫���御����糸����灸散絽活�����"
 
-#: src/compose.c:2527 src/send_message.c:261
+#: src/compose.c:2529 src/send_message.c:261
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "��� %s ��弱�堺��腴������榊憥��茯ゃ��"
 
-#: src/compose.c:2550
+#: src/compose.c:2552
 msgid "Can't save the message to outbox."
 msgstr "��≧��絨�篆＞散�����喝��篁九ぞ筝����"
 
-#: src/compose.c:2586
+#: src/compose.c:2588
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "��≧����上�井�����絎���� key id '%s'"
 
-#: src/compose.c:2648 src/compose.c:2873 src/compose.c:2936 src/compose.c:3056
+#: src/compose.c:2650 src/compose.c:2879 src/compose.c:2942 src/compose.c:3062
 #: src/utils.c:2194
 msgid "can't change file mode\n"
 msgstr "��≧����壕��罟�罅������� \n"
 
-#: src/compose.c:2680
+#: src/compose.c:2682
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1086,140 +1097,140 @@ msgstr ""
 "��≧��莉����絨�篆＞散���膩�腆取┃絎���� %s 莉������� %s���\n"
 "篁����荀���渇�����鐚�"
 
-#: src/compose.c:2744
+#: src/compose.c:2750
 msgid "can't write headers\n"
 msgstr "��≧��絲���ユ�����\n"
 
-#: src/compose.c:3016
+#: src/compose.c:3022
 msgid "can't remove the old message\n"
 msgstr "��≧�������ゅ�����������篆＞散���\n"
 
-#: src/compose.c:3034
+#: src/compose.c:3040
 msgid "queueing message...\n"
 msgstr "�����我��絖�莖����紊鞘賢...\n"
 
-#: src/compose.c:3116
+#: src/compose.c:3122
 msgid "can't find queue folder\n"
 msgstr "��鞘����井��絖�莖����紊障��\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3129
 msgid "can't queue the message\n"
 msgstr "��≧����冗�我��絖�莖����紊障��\n"
 
-#: src/compose.c:3700
+#: src/compose.c:3706
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "��∝��篆＞散���膩����鐚�%s\n"
 
-#: src/compose.c:3798
+#: src/compose.c:3804
 msgid "Creating compose window...\n"
 msgstr "��∝����育�灸散...\n"
 
-#: src/compose.c:3801 src/compose.c:4789
+#: src/compose.c:3807 src/compose.c:4795
 msgid "MIME type"
 msgstr "MIME ������"
 
 #. S_COL_DATE
-#: src/compose.c:3802 src/mimeview.c:150 src/prefs_filter_edit.c:569
+#: src/compose.c:3808 src/mimeview.c:150 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:73 src/select-keys.c:317 src/summaryview.c:386
 msgid "Size"
 msgstr "紊у��"
 
-#: src/compose.c:3853 src/headerview.c:53 src/summary_search.c:169
+#: src/compose.c:3859 src/headerview.c:53 src/summary_search.c:169
 msgid "From:"
 msgstr "箴����鐚�"
 
-#: src/compose.c:4269
+#: src/compose.c:4275
 msgid "Send message"
 msgstr "�����坂拭篁�"
 
-#: src/compose.c:4277
+#: src/compose.c:4283
 msgid "Send later"
 msgstr "緇�������������"
 
-#: src/compose.c:4278
+#: src/compose.c:4284
 msgid "Put into queue folder and send later"
 msgstr "��上�医��篁九ぞ筝�緇�������������"
 
-#: src/compose.c:4286
+#: src/compose.c:4292
 msgid "Draft"
 msgstr "���腮�"
 
-#: src/compose.c:4287
+#: src/compose.c:4293
 msgid "Save to draft folder"
 msgstr "��峨����活��腮粋�����紊�"
 
-#: src/compose.c:4297 src/compose.c:5582
+#: src/compose.c:4303 src/compose.c:5588
 msgid "Insert"
 msgstr "������"
 
-#: src/compose.c:4298
+#: src/compose.c:4304
 msgid "Insert file"
 msgstr "�����ユ��罅�"
 
-#: src/compose.c:4306
+#: src/compose.c:4312
 msgid "Attach"
 msgstr "������"
 
-#: src/compose.c:4307
+#: src/compose.c:4313
 msgid "Attach file"
 msgstr "������罟�罅�"
 
 #. signature
-#: src/compose.c:4317 src/prefs_account.c:1339 src/prefs_common.c:1277
+#: src/compose.c:4323 src/prefs_account.c:1339 src/prefs_common.c:1278
 msgid "Signature"
 msgstr "膂遵��"
 
-#: src/compose.c:4318
+#: src/compose.c:4324
 msgid "Insert signature"
 msgstr "�����ョ綾���"
 
-#: src/compose.c:4327 src/prefs_common.c:1299 src/prefs_common.c:2186
+#: src/compose.c:4333 src/prefs_common.c:1300 src/prefs_common.c:2187
 msgid "Editor"
 msgstr "膩�莠����"
 
-#: src/compose.c:4328
+#: src/compose.c:4334
 msgid "Edit with external editor"
 msgstr "篏睡����銀�����膩�莠����"
 
-#: src/compose.c:4336
+#: src/compose.c:4342
 msgid "Linewrap"
 msgstr "������"
 
-#: src/compose.c:4337
+#: src/compose.c:4343
 msgid "Wrap all long lines"
 msgstr "�����我����������欠�����絖�茵�"
 
-#: src/compose.c:4683
+#: src/compose.c:4689
 msgid "Invalid MIME type."
 msgstr "筝����羈���� MIME ������"
 
-#: src/compose.c:4702
+#: src/compose.c:4708
 msgid "File doesn't exist or is empty."
 msgstr "罟�罅�筝�絖����, ���罟�罅����腥榊��"
 
-#: src/compose.c:4771
+#: src/compose.c:4777
 msgid "Properties"
 msgstr "��у��"
 
-#: src/compose.c:4791
+#: src/compose.c:4797
 msgid "Encoding"
 msgstr "膩�腆�"
 
-#: src/compose.c:4814 src/prefs_folder_item.c:183
+#: src/compose.c:4820 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "莊�緇�"
 
-#: src/compose.c:4815
+#: src/compose.c:4821
 msgid "File name"
 msgstr "罟����"
 
-#: src/compose.c:4969
+#: src/compose.c:4975
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "紊����膩�莠���������巡擦������茯ょ��鐚�`%s'\n"
 
-#: src/compose.c:4995
+#: src/compose.c:5001
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1230,72 +1241,72 @@ msgstr ""
 "荀�綣決辱腟����荅画��腮����鐚�\n"
 "茵�腮����臂ょ��篁ｇ⊆���鐚�%d"
 
-#: src/compose.c:5008
+#: src/compose.c:5014
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "腟����臂ょ��篁ｇ⊆��� %d ���茵�腮�"
 
-#: src/compose.c:5009
+#: src/compose.c:5015
 #, c-format
 msgid "Temporary file: %s"
 msgstr "���絖�罟�罅�鐚�%s"
 
-#: src/compose.c:5033
+#: src/compose.c:5039
 msgid "Compose: input from monitoring process\n"
 msgstr ""
 
 #. failed
-#: src/compose.c:5066
+#: src/compose.c:5072
 msgid "Couldn't exec external editor\n"
 msgstr "��≧����決��紊����膩�莠�������\n"
 
-#: src/compose.c:5070
+#: src/compose.c:5076
 msgid "Couldn't write to file\n"
 msgstr "��≧��絲���ユ��罅����\n"
 
-#: src/compose.c:5072
+#: src/compose.c:5078
 msgid "Pipe read failed\n"
 msgstr "Pipe 莅����紊掩�����\n"
 
-#: src/compose.c:5373 src/compose.c:5381 src/compose.c:5387
+#: src/compose.c:5379 src/compose.c:5387 src/compose.c:5393
 msgid "Can't queue the message."
 msgstr "��≧����冗�我��絖�莖����紊障��"
 
-#: src/compose.c:5478
+#: src/compose.c:5484
 #, fuzzy
 msgid "Select files"
 msgstr "��御��罟�罅�"
 
-#: src/compose.c:5500
+#: src/compose.c:5506
 msgid "Select file"
 msgstr "��御��罟�罅�"
 
-#: src/compose.c:5535
+#: src/compose.c:5541
 msgid "Discard message"
 msgstr "��丈��篆＞散"
 
-#: src/compose.c:5536
+#: src/compose.c:5542
 msgid "This message has been modified. discard it?"
 msgstr "篆＞散綏画←篆���拷�����荀���丈��絎����鐚�"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "Discard"
 msgstr "��丈��"
 
-#: src/compose.c:5537
+#: src/compose.c:5543
 msgid "to Draft"
 msgstr "��上�ヨ��腮粋�����紊�"
 
-#: src/compose.c:5579
+#: src/compose.c:5585
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "���腆阪��荀�絅���� '%s' ������篆＞散罔ｆ�水��鐚�"
 
-#: src/compose.c:5581
+#: src/compose.c:5587
 msgid "Apply template"
 msgstr "絅����篆＞散罔ｆ��"
 
-#: src/compose.c:5582
+#: src/compose.c:5588
 msgid "Replace"
 msgstr "臀����"
 
@@ -1456,12 +1467,12 @@ msgstr "膩�莠�莖����紊�"
 msgid "Input the new name of folder:"
 msgstr "茫�莠後�ユ�亥��莖����紊上��腮縁��"
 
-#: src/editgroup.c:513 src/foldersel.c:491 src/folderview.c:1772
-#: src/folderview.c:1778
+#: src/editgroup.c:513 src/foldersel.c:492 src/folderview.c:1821
+#: src/folderview.c:1827
 msgid "New folder"
 msgstr "��域�����紊�"
 
-#: src/editgroup.c:514 src/foldersel.c:492 src/folderview.c:1779
+#: src/editgroup.c:514 src/foldersel.c:493 src/folderview.c:1828
 msgid "Input the name of new folder:"
 msgstr "茫�莠後�ユ�域�����紊丞�����腮縁��"
 
@@ -1630,160 +1641,156 @@ msgstr "絲���ョ�����荐�絎����紊掩�����\n"
 msgid "Select folder"
 msgstr "��御��莖����紊�"
 
-#: src/foldersel.c:336 src/folderview.c:935 src/prefs_folder_item.c:212
+#: src/foldersel.c:337 src/folderview.c:1008 src/prefs_folder_item.c:212
 msgid "Inbox"
 msgstr "��銀散紊�"
 
-#: src/foldersel.c:340 src/folderview.c:942 src/prefs_folder_item.c:213
+#: src/foldersel.c:341 src/folderview.c:1014 src/prefs_folder_item.c:213
 msgid "Sent"
 msgstr "絲�篁九ぞ"
 
-#: src/foldersel.c:344 src/folderview.c:949 src/prefs_folder_item.c:215
+#: src/foldersel.c:345 src/folderview.c:1020 src/prefs_folder_item.c:215
 msgid "Queue"
 msgstr "���絖�莖����紊�"
 
-#: src/foldersel.c:348 src/folderview.c:956 src/prefs_folder_item.c:216
+#: src/foldersel.c:349 src/folderview.c:1026 src/prefs_folder_item.c:216
 msgid "Trash"
 msgstr "�����ょ����灸散"
 
-#: src/foldersel.c:352 src/folderview.c:965 src/prefs_folder_item.c:214
+#: src/foldersel.c:353 src/folderview.c:1033 src/prefs_folder_item.c:214
 msgid "Drafts"
 msgstr "���腮�"
 
-#: src/foldersel.c:493 src/folderview.c:1776 src/folderview.c:1780
+#: src/foldersel.c:494 src/folderview.c:1825 src/folderview.c:1829
 msgid "NewFolder"
 msgstr "��域�����紊�"
 
-#: src/foldersel.c:501 src/folderview.c:1788 src/folderview.c:1842
+#: src/foldersel.c:502 src/folderview.c:1837 src/folderview.c:1893
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "莖����紊上��腮延賢筝���������� `%c' ������絖�������"
 
-#: src/foldersel.c:511 src/folderview.c:1798 src/folderview.c:1849
+#: src/foldersel.c:512 src/folderview.c:1847 src/folderview.c:1900
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "莖����紊� `%s' 綏峨��������"
 
-#: src/foldersel.c:519 src/folderview.c:1805
+#: src/foldersel.c:520 src/folderview.c:1854
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "��≧�������よ�����紊� `%s'���"
 
-#: src/folderview.c:217 src/folderview.c:233
+#: src/folderview.c:216 src/folderview.c:232
 msgid "/Create _new folder..."
 msgstr "/��∝����亥��莖����紊� (_n)"
 
-#: src/folderview.c:218 src/folderview.c:234
+#: src/folderview.c:217 src/folderview.c:233
 msgid "/_Rename folder..."
 msgstr "/�����医�遵��莖����紊�(_R)..."
 
-#: src/folderview.c:219 src/folderview.c:235
+#: src/folderview.c:218 src/folderview.c:234
 msgid "/_Delete folder"
 msgstr "/�����よ�����紊�(_D)"
 
-#: src/folderview.c:221 src/folderview.c:237
+#: src/folderview.c:220 src/folderview.c:236
 msgid "/Empty _trash"
 msgstr "/羝�腥阪����ょ����灸散(_t)"
 
-#: src/folderview.c:223 src/folderview.c:241 src/folderview.c:257
+#: src/folderview.c:222 src/folderview.c:240 src/folderview.c:256
 msgid "/_Check for new messages"
 msgstr "/罟∽�ユ�育�灸散(_C)"
 
-#: src/folderview.c:225 src/folderview.c:243
+#: src/folderview.c:224 src/folderview.c:242
 msgid "/R_ebuild folder tree"
 msgstr "/���綮肴�����紊丞��罕�(_e)"
 
-#: src/folderview.c:227 src/folderview.c:245 src/folderview.c:260
+#: src/folderview.c:226 src/folderview.c:244 src/folderview.c:259
 msgid "/_Search messages..."
 msgstr "/絨���鞘拭篁� (_S)"
 
-#: src/folderview.c:239 src/folderview.c:255
+#: src/folderview.c:238 src/folderview.c:254
 msgid "/Down_load"
 msgstr "/筝�莠� (_l)"
 
-#: src/folderview.c:251
+#: src/folderview.c:250
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/���荐���域��臂ょ�� (_b)"
 
-#: src/folderview.c:253
+#: src/folderview.c:252
 msgid "/_Remove newsgroup"
 msgstr "/腱脂�ゆ�域��臂ょ��(_R)"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "Creating folder view...\n"
 msgstr "��∝��莖����紊�...\n"
 
-#: src/folderview.c:284
+#: src/folderview.c:353
 msgid "New"
 msgstr "��亥��"
 
 #. S_COL_MARK
-#: src/folderview.c:285 src/prefs_summary_column.c:68
+#: src/folderview.c:364 src/prefs_summary_column.c:68
 msgid "Unread"
 msgstr "���莅����"
 
-#: src/folderview.c:286
+#: src/folderview.c:375
 msgid "#"
 msgstr ""
 
-#: src/folderview.c:432
+#: src/folderview.c:497
 msgid "Setting folder info...\n"
 msgstr "荐�絎�莖����紊�...\n"
 
-#: src/folderview.c:433
+#: src/folderview.c:498
 msgid "Setting folder info..."
 msgstr "荐�絎�莖����紊�..."
 
-#: src/folderview.c:652 src/mainwindow.c:3199 src/setup.c:81
+#: src/folderview.c:743 src/mainwindow.c:3194 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "�����顚����紊� %s%c%s ..."
 
-#: src/folderview.c:656 src/mainwindow.c:3204 src/setup.c:86
+#: src/folderview.c:747 src/mainwindow.c:3199 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "�����顚����紊� %s ..."
 
-#: src/folderview.c:698
+#: src/folderview.c:789
 msgid "Rebuild folder tree"
 msgstr "���綮肴�����紊丞��罕�"
 
-#: src/folderview.c:699
+#: src/folderview.c:790
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "羣�������綮肴�����紊障��腆阪��荀�膵主��鐚�"
 
-#: src/folderview.c:708
+#: src/folderview.c:799
 msgid "Rebuilding folder tree..."
 msgstr "���綮肴�����紊丞��罕�筝�..."
 
-#: src/folderview.c:714
+#: src/folderview.c:805
 msgid "Rebuilding of the folder tree failed."
 msgstr "���綮肴�����紊丞��罕�紊掩�����"
 
-#: src/folderview.c:732
-msgid "Rebuilding all folder trees..."
-msgstr "���綮堺�����莖����紊丞��罕�筝�..."
-
-#: src/folderview.c:809
+#: src/folderview.c:877
 msgid "Checking for new messages in all folders..."
 msgstr "罟∽�ユ�����莖����紊鞘賢�����育�灸散..."
 
-#: src/folderview.c:1591
+#: src/folderview.c:1600
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "綏臥�後�� %s 莖����紊�\n"
 
-#: src/folderview.c:1686
+#: src/folderview.c:1737
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "緇� %s 筝�莠�篆＞散筝�..."
 
-#: src/folderview.c:1722
+#: src/folderview.c:1772
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "緇� %s 筝�莠�篆＞散�����榊憥��茯ゃ��"
 
-#: src/folderview.c:1773
+#: src/folderview.c:1822
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -1793,16 +1800,16 @@ msgstr ""
 "鐚���ユ��莖����紊鞘��荀����絖�莖����紊常��\n"
 "���茫����莖����紊上��腮援��緇���√��筝� `/'鐚�"
 
-#: src/folderview.c:1833
+#: src/folderview.c:1884
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "茫�莠後�� `%s' �����医��腮縁��"
 
-#: src/folderview.c:1834
+#: src/folderview.c:1885
 msgid "Rename folder"
 msgstr "�����医�遵��莖����紊�"
 
-#: src/folderview.c:1913
+#: src/folderview.c:1965
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -1811,24 +1818,24 @@ msgstr ""
 "��������� `%s' 莖����紊鞘����∝��篆＞散���絖�莖����紊冗�遵�����茴������ゃ��\n"
 "���腆阪��荀������ゅ�����鐚�"
 
-#: src/folderview.c:1915
+#: src/folderview.c:1967
 msgid "Delete folder"
 msgstr "�����よ�����紊�"
 
-#: src/folderview.c:1931
+#: src/folderview.c:1989
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "��≧�������よ�����紊� `%s'���"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty trash"
 msgstr "羝�腥阪����ょ����灸散"
 
-#: src/folderview.c:1964
+#: src/folderview.c:2023
 msgid "Empty all messages in trash?"
 msgstr "���腆阪��荀�羝���ゆ�����茴������ょ����灸散鐚�"
 
-#: src/folderview.c:1995
+#: src/folderview.c:2058
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -1837,34 +1844,34 @@ msgstr ""
 "腆阪��荀������や拭膊� %s鐚�\n"
 "羈����鐚�篆∞�延賢�����灸散絨�筝����緇�隋�腆�筝�茴������ゃ��"
 
-#: src/folderview.c:1997
+#: src/folderview.c:2060
 msgid "Remove mailbox"
 msgstr "/�����や拭膊�"
 
-#: src/folderview.c:2032
+#: src/folderview.c:2103
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "���腆阪��荀������� %s ������ IMAP4 絽活��鐚�"
 
-#: src/folderview.c:2033
+#: src/folderview.c:2104
 msgid "Delete IMAP4 account"
 msgstr "������ IMAP4 絽活��"
 
-#: src/folderview.c:2154
+#: src/folderview.c:2241
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "���腆阪��荀������ゆ�域��臂ょ�� `%s' ���鐚�"
 
-#: src/folderview.c:2155
+#: src/folderview.c:2242
 msgid "Delete newsgroup"
 msgstr "�����ゆ�域��臂ょ��"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2285
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "���腆阪��荀������ゆ�域��臂ょ��絽活�� `%s' ���鐚�"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2286
 msgid "Delete news account"
 msgstr "�����ゅ験���"
 
@@ -1912,7 +1919,7 @@ msgstr "�����ョ��"
 msgid "Can't retrieve newsgroup list."
 msgstr "��≧�����緇���銀散篋堺����銀散��域��臂ょ�����������"
 
-#: src/grouplistdialog.c:449 src/summaryview.c:700
+#: src/grouplistdialog.c:449 src/summaryview.c:701
 msgid "Done."
 msgstr "絎����"
 
@@ -2195,7 +2202,7 @@ msgstr "絨� LDIF 罟������ヤ�����膂�"
 msgid "Prev"
 msgstr "���筝�絨�"
 
-#: src/importldif.c:761 src/mainwindow.c:2239
+#: src/importldif.c:761 src/mainwindow.c:2241
 msgid "Next"
 msgstr "筝�筝�絨�"
 
@@ -2285,7 +2292,7 @@ msgstr "��ｇ����� POP3 篌堺����� %s 筝�..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "��≧����ｇ����� POP3 篌堺�����鐚�%s:%d\n"
 
-#: src/inc.c:769 src/send_message.c:460
+#: src/inc.c:769 src/send_message.c:465
 msgid "Authenticating..."
 msgstr "茯�茘�"
 
@@ -2315,7 +2322,7 @@ msgstr "���緇���育�灸散�����檎�鋇�"
 msgid "Deleting message %d"
 msgstr "�����ょ�� %d �����灸散"
 
-#: src/inc.c:804 src/send_message.c:478
+#: src/inc.c:804 src/send_message.c:483
 msgid "Quitting"
 msgstr "��∫��"
 
@@ -2358,7 +2365,8 @@ msgstr "��≧��絲���ユ��罅����"
 msgid "Socket error."
 msgstr "Socket ������茯�"
 
-#: src/inc.c:1110 src/send_message.c:600
+#. consider EOF right after QUIT successful
+#: src/inc.c:1110 src/send_message.c:418 src/send_message.c:605
 msgid "Connection closed by the remote host."
 msgstr "���腴�筝紙����������ｇ�����"
 
@@ -2373,11 +2381,11 @@ msgid ""
 "%s"
 msgstr "篆∞�怨群茴����絎�鐚�%s"
 
-#: src/inc.c:1126 src/send_message.c:585
+#: src/inc.c:1126 src/send_message.c:590
 msgid "Authentication failed."
 msgstr "茯�茘�紊掩��"
 
-#: src/inc.c:1131 src/send_message.c:588
+#: src/inc.c:1131 src/send_message.c:593
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2386,7 +2394,7 @@ msgstr ""
 "茯�茘�紊掩��鐚�\n"
 "%s"
 
-#: src/inc.c:1136 src/send_message.c:604
+#: src/inc.c:1136 src/send_message.c:609
 msgid "Session timed out."
 msgstr "篏�罐���丈��"
 
@@ -2796,320 +2804,320 @@ msgstr "/蕁�腓�(_V)/絖����(_C)/��ユ�� (_EUC-JP)"
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/蕁�腓�(_V)/絖����(_C)/��ユ�� (_Shift__JIS)"
 
-#: src/mainwindow.c:632 src/messageview.c:207
+#: src/mainwindow.c:634 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/蕁�腓�(_V)/絖����(_C)/筝���� (ISO-2022-_CN)"
 
-#: src/mainwindow.c:638 src/messageview.c:212
+#: src/mainwindow.c:640 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/蕁�腓�(_V)/絖����(_C)/������ (ISO-2022-KR)"
 
-#: src/mainwindow.c:651 src/summaryview.c:371
+#: src/mainwindow.c:653 src/summaryview.c:371
 msgid "/_View/Open in new _window"
 msgstr "/蕁�腓�(_V)/�����域��腦�������(_w)"
 
-#: src/mainwindow.c:652 src/messageview.c:224
+#: src/mainwindow.c:654 src/messageview.c:226
 msgid "/_View/Mess_age source"
 msgstr "/蕁�腓�(_V)/茹����篆＞散���紮�腆�(_a)"
 
-#: src/mainwindow.c:653 src/messageview.c:225
+#: src/mainwindow.c:655 src/messageview.c:227
 msgid "/_View/Show all _header"
 msgstr "/蕁�腓�(_V)/蕁�腓堺��������罔����(_h)"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:657
 msgid "/_View/_Update summary"
 msgstr "/蕁�腓�(_V)/��贋�遺拭篁九��茵�(_U)"
 
-#: src/mainwindow.c:657 src/messageview.c:227
+#: src/mainwindow.c:659 src/messageview.c:229
 msgid "/_Message"
 msgstr "/篆＞散(_M)"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:660
 msgid "/_Message/Recei_ve"
 msgstr "/篆＞散(_M)/�･���(_v)"
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/篆＞散(_M)/�･���(_v)/緇�������絽活��筝��･��倶�育�灸散(_c)"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:663
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/篆＞散(_M)/�･���(_v)/緇�������絽活��筝��･��倶�育�灸散(_a)"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:665
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/篆＞散(_M)/�･���(_v)/���羔��･���(_g)"
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:667
 msgid "/_Message/Recei_ve/---"
 msgstr "/篆＞散(_M)/�･���(_v)/---"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:668
 msgid "/_Message/_Send queued messages"
 msgstr "/篆＞散(_M)/絨����絖�莖����紊鞘賢���篆＞散������(_S)"
 
-#: src/mainwindow.c:667 src/mainwindow.c:669 src/mainwindow.c:676
-#: src/mainwindow.c:681 src/mainwindow.c:685 src/mainwindow.c:694
-#: src/messageview.c:230 src/messageview.c:238 src/messageview.c:243
+#: src/mainwindow.c:669 src/mainwindow.c:671 src/mainwindow.c:678
+#: src/mainwindow.c:683 src/mainwindow.c:687 src/mainwindow.c:696
+#: src/messageview.c:232 src/messageview.c:240 src/messageview.c:245
 msgid "/_Message/---"
 msgstr "/篆＞散(_M)/---"
 
-#: src/mainwindow.c:668 src/messageview.c:228
+#: src/mainwindow.c:670 src/messageview.c:230
 msgid "/_Message/Compose _new message"
 msgstr "/篆＞散(_M)/��医����灸散(_n)"
 
-#: src/mainwindow.c:670 src/messageview.c:231
+#: src/mainwindow.c:672 src/messageview.c:233
 msgid "/_Message/_Reply"
 msgstr "/篆＞散(_M)/��贋･���荀�(_R)"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:673
 msgid "/_Message/Repl_y to"
 msgstr "/篆＞散(_M)/���荀�腟�(_y)"
 
-#: src/mainwindow.c:672 src/messageview.c:232
+#: src/mainwindow.c:674 src/messageview.c:234
 msgid "/_Message/Repl_y to/_all"
 msgstr "/篆＞散(_M)/���荀�腟�(_y)/��������銀散篋�(_a)"
 
-#: src/mainwindow.c:673 src/messageview.c:234
+#: src/mainwindow.c:675 src/messageview.c:236
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/篆＞散(_M)/���荀�腟�(_y)/���篏����(_s)"
 
-#: src/mainwindow.c:674 src/messageview.c:236
+#: src/mainwindow.c:676 src/messageview.c:238
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/篆＞散(_M)/���荀�腟�(_y)/Mailing List(_l)"
 
-#: src/mainwindow.c:677 src/messageview.c:239
+#: src/mainwindow.c:679 src/messageview.c:241
 msgid "/_Message/_Forward"
 msgstr "/篆＞散(_M)/莉�絲�(_F)"
 
-#: src/mainwindow.c:678 src/messageview.c:240
+#: src/mainwindow.c:680 src/messageview.c:242
 msgid "/_Message/For_ward as attachment"
 msgstr "/篆＞散(_M)/絨�篆＞散��倶��������罟�莉�絲�(_w)"
 
-#: src/mainwindow.c:680 src/messageview.c:242
+#: src/mainwindow.c:682 src/messageview.c:244
 msgid "/_Message/Redirec_t"
 msgstr "/篆＞散(_M)/篆＞散絨����(_t)"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:684
 msgid "/_Message/M_ove..."
 msgstr "/篆＞散(_M)/腱糸��...(_o)"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "/_Message/_Copy..."
 msgstr "/篆＞散(_M)/茲�茖�...(_C)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686
 msgid "/_Message/_Delete"
 msgstr "/篆＞散(_M)/������(_D)"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:688
 msgid "/_Message/_Mark"
 msgstr "/篆＞散(_M)/罔�荐�(_M)"
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:689
 msgid "/_Message/_Mark/_Mark"
 msgstr "/篆＞散(_M)/罔�荐�(_M)/罔�荐�(_M)"
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:690
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/篆＞散(_M)/罔�荐�(_M)/�ｻ��ゆ��荐�(_U)"
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "/_Message/_Mark/---"
 msgstr "/篆＞散(_M)/罔�荐�(_M)/---"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/篆＞散(_M)/罔�荐�(_M)/罔�荐�������莅�(_e)"
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/篆＞散(_M)/罔�荐�(_M)/罔�荐����綏画��(_d)"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/篆＞散(_M)/罔�荐�(_M)/罔�荐�������篆＞散���綏画��(_d)"
 
-#: src/mainwindow.c:695 src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:246
 msgid "/_Message/Re-_edit"
 msgstr "/篆＞散(_M)/�����亥隈莠�(_e)"
 
-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:701 src/messageview.c:250
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/綏ュ��(_T)/絨�絲�篆＞査�����ヤ�����膂�(_k)"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:704
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/綏ュ��(_T)/���羶乗�����紊鞘賢������篆＞散(_F)"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:706
 msgid "/_Tools/Filter _selected messages"
 msgstr "/綏ュ��(_T)/���羶冗�御�����篆＞散(_F)"
 
-#: src/mainwindow.c:706 src/messageview.c:251
+#: src/mainwindow.c:708 src/messageview.c:253
 msgid "/_Tools/_Create filter rule"
 msgstr "/綏ュ��(_T)/��∝��篆＞散���羶乗�����(_C)"
 
-#: src/mainwindow.c:707 src/messageview.c:253
+#: src/mainwindow.c:709 src/messageview.c:255
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/綏ュ��(_T)/��∝��篆＞散���羶乗�����(_C)/��������∝��"
 
-#: src/mainwindow.c:709 src/messageview.c:255
+#: src/mainwindow.c:711 src/messageview.c:257
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/綏ュ��(_T)/��∝��篆＞散���羶乗�����(_C)/箴�箴�羣�(_F)"
 
-#: src/mainwindow.c:711 src/messageview.c:257
+#: src/mainwindow.c:713 src/messageview.c:259
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/綏ュ��(_T)/��∝��篆＞散���羶乗�����(_C)/箴���銀拭篋�(_T)"
 
-#: src/mainwindow.c:713 src/messageview.c:259
+#: src/mainwindow.c:715 src/messageview.c:261
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/綏ュ��(_T)/��∝��篆＞散���羶乗�����(_C)/箴�罔�蕁�(_S)"
 
-#: src/mainwindow.c:718
+#: src/mainwindow.c:720
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/綏ュ��(_T)/�����ら��荀����篆＞散(_p)"
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:723
 msgid "/_Tools/E_xecute"
 msgstr "/綏ュ��(_T)/��決��(_x)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:725
 msgid "/_Tools/_Log window"
 msgstr "/綏ュ��(_T)/膣����荀�腦�(_L)"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:727
 msgid "/_Configuration"
 msgstr "/荐�絎�(_C)"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:728
 msgid "/_Configuration/_Common preferences..."
 msgstr "/荐�絎�(_C)/筝����荐�絎�...(_C)"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:730
 msgid "/_Configuration/_Filter setting..."
 msgstr "/荐�絎�(_C)/篆＞散���羶乗┃絎�...(_F)"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:732
 msgid "/_Configuration/_Template..."
 msgstr "/荐�絎�(_C)/篆＞散罔ｆ�粋┃絎�...(_T)"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:733
 msgid "/_Configuration/_Actions..."
 msgstr "/荐�絎�(_C)/紊�������篁よ┃絎�...(_A)"
 
-#: src/mainwindow.c:732
+#: src/mainwindow.c:734
 msgid "/_Configuration/---"
 msgstr "/荐�絎�(_C)/---"
 
-#: src/mainwindow.c:733
+#: src/mainwindow.c:735
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/荐�絎�(_C)/������絽活��荐�絎�(_P)"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:737
 msgid "/_Configuration/Create _new account..."
 msgstr "/荐�絎�(_C)/��医��絽活��...(_n)"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:739
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/荐�絎�(_C)/膩�莠�絽活��...(_E)"
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:741
 msgid "/_Configuration/C_hange current account"
 msgstr "/荐�絎�(_C)/��壕���憝��絽活��(_h)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:745
 msgid "/_Help/_Manual"
 msgstr "/茯����(_H)/茯�������篁�(_M)"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:746
 msgid "/_Help/_Manual/_English"
 msgstr "/茯����(_H)/茯�������篁�(_M)/��掩��(_E)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/茯����(_H)/茯�������篁�(_M)/��ユ��(_J)"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:748
 msgid "/_Help/_FAQ"
 msgstr "/茯����(_H)/絽後����馹�茹ｇ��(_F)"
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:749
 msgid "/_Help/_FAQ/_English"
 msgstr "/茯����(_H)/絽後����馹�茹ｇ��(_F)/��掩��(_E)"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Help/_FAQ/_German"
 msgstr "/茯����(_H)/絽後����馹�茹ｇ��(_F)/緇傑��(_F)"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/茯����(_H)/絽後����馹�茹ｇ��(_F)/茱睡��������(_S)"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:752
 msgid "/_Help/_FAQ/_French"
 msgstr "/茯����(_H)/絽後����馹�茹ｇ��(_F)/羈����(_F)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/茯����(_H)/絽後����馹�茹ｇ��(_F)/臂�紊у�����(_E)"
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:754
 msgid "/_Help/---"
 msgstr "/茯����(_H)/---"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:794
 msgid "Creating main window...\n"
 msgstr "��∝��筝肢��腦�...\n"
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:954
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "筝肢��腦�鐚�蕁���� %d ���臀�紊掩�����\n"
 
-#: src/mainwindow.c:1030 src/summaryview.c:1368 src/summaryview.c:1677
+#: src/mainwindow.c:1032 src/summaryview.c:1369 src/summaryview.c:1677
 #: src/summaryview.c:1785 src/summaryview.c:1831 src/summaryview.c:2453
 #: src/summaryview.c:3090 src/summaryview.c:3156 src/summaryview.c:3181
 #: src/summaryview.c:3294
 msgid "done.\n"
 msgstr "絎�������\n"
 
-#: src/mainwindow.c:1146 src/mainwindow.c:1187 src/mainwindow.c:1215
+#: src/mainwindow.c:1148 src/mainwindow.c:1189 src/mainwindow.c:1217
 msgid "Untitled"
 msgstr "��≧��蕁�"
 
-#: src/mainwindow.c:1216
+#: src/mainwindow.c:1218
 msgid "none"
 msgstr "���"
 
-#: src/mainwindow.c:1266
+#: src/mainwindow.c:1268
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Changing window separation type from %d to %d\n"
 
-#: src/mainwindow.c:1486
+#: src/mainwindow.c:1488
 msgid "Offline"
 msgstr "��∝��"
 
-#: src/mainwindow.c:1487
+#: src/mainwindow.c:1489
 msgid "You are offline. Go online?"
 msgstr "���������罩ｉ�∝��筝����荀���ｇ�����鐚�"
 
-#: src/mainwindow.c:1501
+#: src/mainwindow.c:1503
 msgid "Empty all trash"
 msgstr "羝�腥阪����ょ����灸散"
 
-#: src/mainwindow.c:1502
+#: src/mainwindow.c:1504
 msgid "Empty messages in all trash?"
 msgstr "���腆阪��荀�羝���ゆ�����茴������ょ����灸散鐚�"
 
-#: src/mainwindow.c:1530
+#: src/mainwindow.c:1532
 msgid "Add mailbox"
 msgstr "��医��篆∞��"
 
-#: src/mainwindow.c:1531
+#: src/mainwindow.c:1533
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3119,16 +3127,16 @@ msgstr ""
 "筝�茫�羈���鋇�荀�莠後�ュ群絖�������篆∞�怨��腮宴��\n"
 "膤紫輝絨������������ゅ�ユ�����篆∞�怨群絖�������"
 
-#: src/mainwindow.c:1537
+#: src/mainwindow.c:1539
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "篆∞�� %s 綏峨��������"
 
-#: src/mainwindow.c:1542 src/setup.c:57
+#: src/mainwindow.c:1544 src/setup.c:57
 msgid "Mailbox"
 msgstr "篆∞��"
 
-#: src/mainwindow.c:1548 src/setup.c:63
+#: src/mainwindow.c:1550 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3137,141 +3145,141 @@ msgstr ""
 "��≧����∝��篆∞�援��������\n"
 "�����醇�������阪��罔ｅ��腮援��罟�罅�綏牙��絖����鐚����������篏�羃����罨�������篁ラ����亥��������"
 
-#: src/mainwindow.c:1921
+#: src/mainwindow.c:1923
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 莖����紊上��茵�"
 
-#: src/mainwindow.c:1941 src/messageview.c:358
+#: src/mainwindow.c:1943 src/messageview.c:360
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 篆＞散���茵�"
 
-#: src/mainwindow.c:2088 src/summaryview.c:340
+#: src/mainwindow.c:2090 src/summaryview.c:340
 msgid "/_Reply"
 msgstr "/��贋･���荀�(_R)"
 
-#: src/mainwindow.c:2089
+#: src/mainwindow.c:2091
 msgid "/Reply to _all"
 msgstr "/���������荀�(_a)"
 
-#: src/mainwindow.c:2090
+#: src/mainwindow.c:2092
 msgid "/Reply to _sender"
 msgstr "/���荀�腟����篏����(_s)"
 
-#: src/mainwindow.c:2091
+#: src/mainwindow.c:2093
 msgid "/Reply to mailing _list"
 msgstr "/���荀���� Mailing list(_l)"
 
-#: src/mainwindow.c:2096 src/summaryview.c:347
+#: src/mainwindow.c:2098 src/summaryview.c:347
 msgid "/_Forward"
 msgstr "/莉�絲�(_F)"
 
-#: src/mainwindow.c:2097 src/summaryview.c:348
+#: src/mainwindow.c:2099 src/summaryview.c:348
 msgid "/For_ward as attachment"
 msgstr "/絨�篆＞散��倶��������罟�莉�絲�(_w)"
 
-#: src/mainwindow.c:2098 src/summaryview.c:349
+#: src/mainwindow.c:2100 src/summaryview.c:349
 msgid "/Redirec_t"
 msgstr "/篆＞散絨����(_t)"
 
-#: src/mainwindow.c:2134
+#: src/mainwindow.c:2136
 msgid "Get"
 msgstr "罟∽�ラ�灸散"
 
-#: src/mainwindow.c:2135
+#: src/mainwindow.c:2137
 msgid "Incorporate new mail"
 msgstr "罟∽�ョ�����絽活�������育�灸散"
 
-#: src/mainwindow.c:2142
+#: src/mainwindow.c:2144
 msgid "Get all"
 msgstr "������罟∽��"
 
-#: src/mainwindow.c:2143
+#: src/mainwindow.c:2145
 msgid "Incorporate new mail of all accounts"
 msgstr "罟∽�ユ�����絽活�������育�灸散"
 
-#: src/mainwindow.c:2154
+#: src/mainwindow.c:2156
 msgid "Send queued message(s)"
 msgstr "絨����絖�莖����紊鞘賢���篆＞散������"
 
-#: src/mainwindow.c:2164 src/prefs_account.c:705 src/prefs_common.c:856
+#: src/mainwindow.c:2166 src/prefs_account.c:705 src/prefs_common.c:856
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "��医����灸散"
 
-#: src/mainwindow.c:2165
+#: src/mainwindow.c:2167
 msgid "Compose new message"
 msgstr "膩�莠���育�灸散"
 
-#: src/mainwindow.c:2173 src/prefs_common.c:1369
+#: src/mainwindow.c:2175 src/prefs_common.c:1370
 msgid "Reply"
 msgstr "���荀�"
 
-#: src/mainwindow.c:2174 src/mainwindow.c:2187
+#: src/mainwindow.c:2176 src/mainwindow.c:2189
 msgid "Reply to the message"
 msgstr "���荀�篆＞散"
 
-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2194
 msgid "Reply all"
 msgstr "���������荀�"
 
-#: src/mainwindow.c:2193
+#: src/mainwindow.c:2195
 msgid "Reply to all"
 msgstr "���������荀�"
 
-#: src/mainwindow.c:2201 src/prefs_filter_edit.c:719
+#: src/mainwindow.c:2203 src/prefs_filter_edit.c:741
 msgid "Forward"
 msgstr "莉�絲�"
 
-#: src/mainwindow.c:2202 src/mainwindow.c:2215
+#: src/mainwindow.c:2204 src/mainwindow.c:2217
 msgid "Forward the message"
 msgstr "莉�絲�篆＞散"
 
-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2224
 msgid "Delete the message"
 msgstr "�����や拭篁�"
 
-#: src/mainwindow.c:2230
+#: src/mainwindow.c:2232
 msgid "Execute"
 msgstr "��決��"
 
-#: src/mainwindow.c:2231
+#: src/mainwindow.c:2233
 msgid "Execute marked process"
 msgstr "��決��罔�荐����茵�腮�"
 
-#: src/mainwindow.c:2240
+#: src/mainwindow.c:2242
 msgid "Next unread message"
 msgstr "筝�筝�絨����莅���灸散"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2253
 msgid "Prefs"
 msgstr "荐�絎�"
 
-#: src/mainwindow.c:2252
+#: src/mainwindow.c:2254
 msgid "Common preferences"
 msgstr "筝����荐�絎�"
 
-#: src/mainwindow.c:2259 src/prefs_folder_item.c:258
+#: src/mainwindow.c:2261 src/prefs_folder_item.c:258
 #: src/prefs_folder_item.c:269 src/progressdialog.c:50
 msgid "Account"
 msgstr "絽活��"
 
-#: src/mainwindow.c:2260
+#: src/mainwindow.c:2262
 msgid "Account setting"
 msgstr "絽活��荐�絎�"
 
-#: src/mainwindow.c:2434
+#: src/mainwindow.c:2436
 msgid "You are offline. Click the icon to go online."
 msgstr "���������罩ｉ�∝��筝�������筝���������√奨��ｇ�����"
 
-#: src/mainwindow.c:2445
+#: src/mainwindow.c:2447
 msgid "You are online. Click the icon to go offline."
 msgstr "���������罩ｉ�ｇ��筝�������筝���������∝��綏ヤ�����"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit"
 msgstr "��∫��"
 
-#: src/mainwindow.c:2633
+#: src/mainwindow.c:2635
 msgid "Exit this program?"
 msgstr "���腆阪��荀���∫�����鐚�"
 
@@ -3393,28 +3401,28 @@ msgstr "���絨�綏峨�医鮎腴����荀�緇����腴�膵主�����絨����鐚�"
 msgid "Search finished"
 msgstr "���絨�腟����"
 
-#: src/messageview.c:278
+#: src/messageview.c:280
 msgid "Creating message view...\n"
 msgstr "��∝��篆＞散荀�腦�...\n"
 
-#: src/messageview.c:303 src/prefs_common.c:1566
+#: src/messageview.c:305 src/prefs_common.c:1567
 msgid "Text"
 msgstr "���絖�"
 
-#: src/messageview.c:308
+#: src/messageview.c:310
 msgid "Attachments"
 msgstr "������罟�"
 
-#: src/messageview.c:646 src/summaryview.c:2724
+#: src/messageview.c:648 src/summaryview.c:2724
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "��≧����峨��罟�罅� `%s'���"
 
-#: src/messageview.c:697 src/prefs_common.c:2175 src/summaryview.c:2744
+#: src/messageview.c:699 src/prefs_common.c:2176 src/summaryview.c:2744
 msgid "Print"
 msgstr "������"
 
-#: src/messageview.c:698 src/summaryview.c:2745
+#: src/messageview.c:700 src/summaryview.c:2745
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3423,7 +3431,7 @@ msgstr ""
 "茫�莠後�ュ����井��篁わ��\n"
 "鐚� `%s' 絨����茴�臀������堺�����鐚�"
 
-#: src/messageview.c:704 src/summaryview.c:2751
+#: src/messageview.c:706 src/summaryview.c:2751
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3859,7 +3867,7 @@ msgstr "�･��銀失������筝������������灸散���"
 msgid "Receive size limit"
 msgstr "�･��狗�灸散紊у��������"
 
-#: src/prefs_account.c:1058 src/prefs_filter_edit.c:622
+#: src/prefs_account.c:1058 src/prefs_filter_edit.c:643
 msgid "KB"
 msgstr ""
 
@@ -3879,7 +3887,7 @@ msgstr "鐚����膓����羶丞��篆＞散絨����茴������育�����莖����紊鞘��鐚�"
 msgid "Authentication method"
 msgstr "茯�茘���号��"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1205
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1206
 msgid "Automatic"
 msgstr "������"
 
@@ -3903,7 +3911,7 @@ msgstr "��∝����灸散茘���ョ⊆"
 msgid "Add user-defined header"
 msgstr "�����ヤ戎������絎�臂����罔����"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1731 src/prefs_common.c:1756
+#: src/prefs_account.c:1196 src/prefs_common.c:1732 src/prefs_common.c:1757
 msgid " Edit... "
 msgstr "膩�莠�..."
 
@@ -4368,30 +4376,35 @@ msgid "Simplified Chinese (GB2312)"
 msgstr "膂♂��筝���� (GB2312)"
 
 #: src/prefs_common.c:1162
+#, fuzzy
+msgid "Simplified Chinese (GBK)"
+msgstr "膂♂��筝���� (GB2312)"
+
+#: src/prefs_common.c:1163
 msgid "Traditional Chinese (Big5)"
 msgstr "膵�蕭�筝���� (Big5)"
 
-#: src/prefs_common.c:1164
+#: src/prefs_common.c:1165
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "膵�蕭�筝���� (EUC-TW)"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1166
 msgid "Chinese (ISO-2022-CN)"
 msgstr "筝���� (ISO-2022-CN)"
 
-#: src/prefs_common.c:1168
+#: src/prefs_common.c:1169
 msgid "Korean (EUC-KR)"
 msgstr "������ (EUC-KR)"
 
-#: src/prefs_common.c:1170
+#: src/prefs_common.c:1171
 msgid "Thai (TIS-620)"
 msgstr "羈井�� (TIS-620)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1172
 msgid "Thai (Windows-874)"
 msgstr "羈井�� (Windows-874)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -4400,451 +4413,451 @@ msgstr ""
 "��ユ����悟�������������御�����鐚�膤紫輝絨���肴�������堺����ゆ�隙戎������\n"
 "���������茯�膤肢┃絎����"
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1196
 msgid "Transfer encoding"
 msgstr "��渇��箙�膩�腆�"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1219
 #, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr "茫����絎���狗�灸散筝脂����у�劫�������� ASCII 絖�������鐚�篏睡�����腮�膩�腆寂����渇����у�鴻��"
 
-#: src/prefs_common.c:1288
+#: src/prefs_common.c:1289
 msgid "Signature separator"
 msgstr "膂遵��������膃����"
 
-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1298
 msgid "Insert automatically"
 msgstr "�����������ョ綾���"
 
-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1308
 msgid "Automatically launch the external editor"
 msgstr "��������弱û�����膩�莠����"
 
-#: src/prefs_common.c:1317
+#: src/prefs_common.c:1318
 msgid "Undo level"
 msgstr "緇����膣����"
 
-#: src/prefs_common.c:1337
+#: src/prefs_common.c:1338
 msgid "Wrap messages at"
 msgstr "罸頫����紊�"
 
-#: src/prefs_common.c:1349
+#: src/prefs_common.c:1350
 msgid "characters"
 msgstr "���絖����"
 
-#: src/prefs_common.c:1359
+#: src/prefs_common.c:1360
 msgid "Wrap quotation"
 msgstr "���茵����蕁�腓榊�����"
 
-#: src/prefs_common.c:1365
+#: src/prefs_common.c:1366
 msgid "Wrap on input"
 msgstr "�����画叱��ラ����欠�����絖�茵�"
 
-#: src/prefs_common.c:1367
+#: src/prefs_common.c:1368
 msgid "Wrap before sending"
 msgstr "絲����箙�������������茵�"
 
-#: src/prefs_common.c:1377
+#: src/prefs_common.c:1378
 msgid "Automatically select account for replies"
 msgstr "���篆≧�������檎��罨�篏�筝������������ヤ�������糸����灸散篆∞�縁��"
 
-#: src/prefs_common.c:1379
+#: src/prefs_common.c:1380
 msgid "Quote message when replying"
 msgstr "���篆≧��綣����������"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1382
 msgid "Reply button invokes mailing list reply"
 msgstr "莅���� Mailing List 篆＞散������筝�������荀�������茵�腓阪��荀�腟� Mailing list"
 
 #. reply
-#: src/prefs_common.c:1427
+#: src/prefs_common.c:1428
 msgid "Reply format"
 msgstr "���荀���弱��"
 
-#: src/prefs_common.c:1442 src/prefs_common.c:1484
+#: src/prefs_common.c:1443 src/prefs_common.c:1485
 msgid "Quotation mark"
 msgstr "綣�荐�膃����"
 
 #. forward
-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1470
 msgid "Forward format"
 msgstr "莉�絲���弱��"
 
-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1517
 msgid " Description of symbols "
 msgstr "��号��膃����篁ｈ；�����靸�"
 
-#: src/prefs_common.c:1557
+#: src/prefs_common.c:1558
 msgid "Font"
 msgstr "絖����"
 
-#: src/prefs_common.c:1589
+#: src/prefs_common.c:1590
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "絨�罔�������腮援浸茘���坂��"
 
-#: src/prefs_common.c:1592
+#: src/prefs_common.c:1593
 msgid "Display unread number next to folder name"
 msgstr "��ユ�����莅�篆＞散鐚�絨演¨腓阪��莖����紊上��腮怨�����"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1602
 msgid "Abbreviate newsgroups longer than"
 msgstr "��域��臂ょ��膰�絲���桁墾紊ф��"
 
-#: src/prefs_common.c:1616
+#: src/prefs_common.c:1617
 msgid "letters"
 msgstr "���絖�罸�"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1622
+#: src/prefs_common.c:1623
 msgid "Summary View"
 msgstr "篆＞散���茵�"
 
-#: src/prefs_common.c:1631
+#: src/prefs_common.c:1632
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "��ョ�寂拭篋堺��篏����綏縁��絨怨��篆＞散���茵����箴�羣�筝�蕁�腓堺�銀拭篋�"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1634
 msgid "Expand threads"
 msgstr "������絮����篆＞散筝峨��"
 
-#: src/prefs_common.c:1641 src/prefs_common.c:2464 src/prefs_common.c:2502
+#: src/prefs_common.c:1642 src/prefs_common.c:2465 src/prefs_common.c:2503
 msgid "Date format"
 msgstr "��ユ����弱��"
 
-#: src/prefs_common.c:1662
+#: src/prefs_common.c:1663
 msgid " Set display item of summary... "
 msgstr "荐�絎�篆＞散���茵���檎��..."
 
-#: src/prefs_common.c:1727
+#: src/prefs_common.c:1728
 msgid "Enable coloration of message"
 msgstr "篆＞散筝����綣�荐����莇���ｇ��蕁�腓肴�����"
 
-#: src/prefs_common.c:1741
+#: src/prefs_common.c:1742
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "絨����綵∵�掩�������後��篁ュ��綵≫��蕁�腓� (�Ū�������ユ��)"
 
-#: src/prefs_common.c:1747
+#: src/prefs_common.c:1748
 msgid "Display header pane above message view"
 msgstr "���蕁�腓坂拭篁倶��筝���劫����ユ�����莖�荐�"
 
-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1755
 msgid "Display short headers on message view"
 msgstr "���篆＞散���荀巡賢蕁�腓坂拭篁倶�����"
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1767
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1779
 msgid "Line space"
 msgstr "茵����莊�"
 
-#: src/prefs_common.c:1792 src/prefs_common.c:1830
+#: src/prefs_common.c:1793 src/prefs_common.c:1831
 msgid "pixel(s)"
 msgstr "��靘� (pixels)"
 
-#: src/prefs_common.c:1797
+#: src/prefs_common.c:1798
 msgid "Scroll"
 msgstr "��画燦"
 
-#: src/prefs_common.c:1804
+#: src/prefs_common.c:1805
 msgid "Half page"
 msgstr "筝�罨≦�����"
 
-#: src/prefs_common.c:1810
+#: src/prefs_common.c:1811
 msgid "Smooth scroll"
 msgstr "綛恰����峨��"
 
-#: src/prefs_common.c:1816
+#: src/prefs_common.c:1817
 msgid "Step"
 msgstr "罸閩≧�峨��"
 
-#: src/prefs_common.c:1836
+#: src/prefs_common.c:1837
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common.c:1844
+#: src/prefs_common.c:1845
 msgid "Resize attached large images to fit in the window"
 msgstr "茯炊�顔�����綵怨�鎀у��"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1847
 #, fuzzy
 msgid "Display images as inline"
 msgstr "蕁�腓堺�����荐�絎�"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1893
 msgid "Automatically check signatures"
 msgstr "������罟∽�ユ�娯��膂順��"
 
-#: src/prefs_common.c:1895
+#: src/prefs_common.c:1896
 msgid "Show signature check result in a popup window"
 msgstr "絨���娯��膂順��罟∽�ョ�����蕁�腓阪���Ί��荀�腦�"
 
-#: src/prefs_common.c:1898
+#: src/prefs_common.c:1899
 msgid "Store passphrase in memory temporarily"
 msgstr "絨�絲�腆主��茯�������絖����荐���狗��筝�"
 
-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1914
 msgid "Expired after"
 msgstr "������鐚�"
 
-#: src/prefs_common.c:1926
+#: src/prefs_common.c:1927
 msgid "minute(s) "
 msgstr "������"
 
-#: src/prefs_common.c:1939
+#: src/prefs_common.c:1940
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "鐚���ヨ┃絎���� '0' ���茵�腓堺�����������鐚�"
 
-#: src/prefs_common.c:1953
+#: src/prefs_common.c:1954
 msgid "Grab input while entering a passphrase"
 msgstr "莠後�� passphrase ���������莠後��"
 
-#: src/prefs_common.c:1958
+#: src/prefs_common.c:1959
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "��� GnuPG ��≧�����篏�鐚������������������弱�肴�����"
 
-#: src/prefs_common.c:2010
+#: src/prefs_common.c:2011
 msgid "Always open messages in summary when selected"
 msgstr "���篆＞散���茵���御��篆＞散���������篆＞散���"
 
-#: src/prefs_common.c:2014
+#: src/prefs_common.c:2015
 msgid "Open first unread message when entering a folder"
 msgstr "��峨�ヨ�����紊丈����贋･莊喝�亥��筝�絨����莅�篆＞散筝�"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:2019
 msgid "Only mark message as read when opened in new window"
 msgstr "�Û����������遺拭篁倶��罔�腓榊�堺��莅�"
 
-#: src/prefs_common.c:2022
+#: src/prefs_common.c:2023
 msgid "Go to inbox after receiving new mail"
 msgstr "�･��九����育�灸散緇���贋･��峨�ユ�銀散紊鞘賢"
 
-#: src/prefs_common.c:2030
+#: src/prefs_common.c:2031
 msgid "Execute immediately when moving or deleting messages"
 msgstr "腱糸����������や拭篁倶��腴���喝�決��"
 
-#: src/prefs_common.c:2042
+#: src/prefs_common.c:2043
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "鐚���ユ�ら�檎��������鐚����綽�������筝������決�������������決��腱糸����������わ��"
 
-#: src/prefs_common.c:2050
+#: src/prefs_common.c:2051
 msgid "Receive dialog"
 msgstr "�･��狗�峨墾絨�荅援��"
 
-#: src/prefs_common.c:2060
+#: src/prefs_common.c:2061
 msgid "Show receive dialog"
 msgstr "蕁�腓堺･��銀拭篁句����峨墾絨�荅援��"
 
-#: src/prefs_common.c:2070
+#: src/prefs_common.c:2071
 msgid "Always"
 msgstr "筝�緇�蕁�腓�"
 
-#: src/prefs_common.c:2071
+#: src/prefs_common.c:2072
 msgid "Only on manual receiving"
 msgstr "�Û����������九����灸散���蕁�腓�"
 
-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2074
 msgid "Never"
 msgstr "筝�蕁�腓�"
 
-#: src/prefs_common.c:2078
+#: src/prefs_common.c:2079
 msgid "Don't popup error dialog on receive error"
 msgstr "�･��狗��茯ゆ��筝�荀����������茯よ��腦����"
 
-#: src/prefs_common.c:2081
+#: src/prefs_common.c:2082
 msgid "Close receive dialog when finished"
 msgstr "絎��������������･��銀拭篁句����峨墾絨�荅援��"
 
-#: src/prefs_common.c:2087
+#: src/prefs_common.c:2088
 msgid " Set key bindings... "
 msgstr "荐�絎���演��"
 
-#: src/prefs_common.c:2143
+#: src/prefs_common.c:2144
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "紊�������篁わ��%s 絨����茴�臀�������罟������� URI鐚�"
 
-#: src/prefs_common.c:2152
+#: src/prefs_common.c:2153
 msgid "Web browser"
 msgstr "��頳遵��"
 
-#: src/prefs_common.c:2216
+#: src/prefs_common.c:2217
 msgid "Add address to destination when double-clicked"
 msgstr "���篏����膂推賢鐚������������������贋･絨�荅臥�糸����灸散�����ユ�銀拭篋坂賢"
 
-#: src/prefs_common.c:2218
+#: src/prefs_common.c:2219
 msgid "On exit"
 msgstr "��∫��荐�絎�"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2227
 msgid "Confirm on exit"
 msgstr "��∫�����腆肴��"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2234
 msgid "Empty trash on exit"
 msgstr "��∫�����羝�腥阪����ょ����灸散"
 
-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2236
 msgid "Ask before emptying"
 msgstr "羝���ゆ��腆肴��"
 
-#: src/prefs_common.c:2239
+#: src/prefs_common.c:2240
 msgid "Warn if there are queued messages"
 msgstr "��∫�������ユ��絨���������坂��篆＞散��括�弱�肴�����"
 
-#: src/prefs_common.c:2245
+#: src/prefs_common.c:2246
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O 膈�緇�������鐚�"
 
-#: src/prefs_common.c:2258
+#: src/prefs_common.c:2259
 msgid "second(s)"
 msgstr "腱�"
 
-#: src/prefs_common.c:2440
+#: src/prefs_common.c:2441
 msgid "the full abbreviated weekday name"
 msgstr "��延�������延�����..."
 
-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2442
 msgid "the full weekday name"
 msgstr "������筝����������篋����..."
 
-#: src/prefs_common.c:2442
+#: src/prefs_common.c:2443
 msgid "the abbreviated month name"
 msgstr "1������2������..."
 
-#: src/prefs_common.c:2443
+#: src/prefs_common.c:2444
 msgid "the full month name"
 msgstr "筝�������篋�������..."
 
-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2445
 msgid "the preferred date and time for the current locale"
 msgstr "絎���雁��茱水����ユ�����������鐚������井�����鐚�"
 
-#: src/prefs_common.c:2445
+#: src/prefs_common.c:2446
 msgid "the century number (year/100)"
 msgstr "筝�膣� (綛�/100)"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2447
 msgid "the day of the month as a decimal number"
 msgstr "篁�紊����綛乗�� (篁ユ�後��茵�腓�)"
 
-#: src/prefs_common.c:2447
+#: src/prefs_common.c:2448
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "�憜��綛冗����� (綮水�������駈��篁ユ�後��茵�腓�)"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2449
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "�憜��綛冗����� (���篋������駈��篁ユ�後��茵�腓�)"
 
-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2450
 msgid "the day of the year as a decimal number"
 msgstr "篁�紊����篁�綛雁��膃�綛上ぉ (篁ユ�後��茵�腓�)"
 
-#: src/prefs_common.c:2450
+#: src/prefs_common.c:2451
 msgid "the month as a decimal number"
 msgstr "�憜�����綛丈�� (篁ユ�後��茵�腓�)"
 
-#: src/prefs_common.c:2451
+#: src/prefs_common.c:2452
 msgid "the minute as a decimal number"
 msgstr "�憜�����綛上�� (篁ユ�後��茵�腓�)"
 
-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2453
 msgid "either AM or PM"
 msgstr "筝�������筝����"
 
-#: src/prefs_common.c:2453
+#: src/prefs_common.c:2454
 msgid "the second as a decimal number"
 msgstr "�憜�����綛丞�� (篁ユ�後��茵�腓�)"
 
-#: src/prefs_common.c:2454
+#: src/prefs_common.c:2455
 msgid "the day of the week as a decimal number"
 msgstr "�憜�����筝���援��膃�綛上ぉ (篁ユ�後��茵�腓�)"
 
-#: src/prefs_common.c:2455
+#: src/prefs_common.c:2456
 msgid "the preferred date for the current locale"
 msgstr "絎���雁��茱水����ユ�� (�����井�����)"
 
-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2457
 msgid "the last two digits of a year"
 msgstr "茱水��綛岩蚕���緇����篏���後��"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2458
 msgid "the year as a decimal number"
 msgstr "茱水��綛岩蚕 (篁ユ�後��茵�腓�)"
 
-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2459
 msgid "the time zone or name or abbreviation"
 msgstr "������"
 
-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2480
 msgid "Specifier"
 msgstr "��号��膃����"
 
-#: src/prefs_common.c:2480
+#: src/prefs_common.c:2481
 msgid "Description"
 msgstr "��颷�"
 
-#: src/prefs_common.c:2520
+#: src/prefs_common.c:2521
 msgid "Example"
 msgstr "膀�箴�"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2602
 msgid "Set message colors"
 msgstr "荐�絎�蕁����"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2610
 msgid "Colors"
 msgstr "蕁����"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2644
 msgid "Quoted Text - First Level"
 msgstr "綣�荐���у�� - 膃�筝�絮�"
 
-#: src/prefs_common.c:2649
+#: src/prefs_common.c:2650
 msgid "Quoted Text - Second Level"
 msgstr "綣�荐���у�� - 膃�篋�絮�"
 
-#: src/prefs_common.c:2655
+#: src/prefs_common.c:2656
 msgid "Quoted Text - Third Level"
 msgstr "綣�荐���у�� - 膃�筝�絮�"
 
-#: src/prefs_common.c:2661
+#: src/prefs_common.c:2662
 msgid "URI link"
 msgstr "莇���ｇ��"
 
-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2669
 msgid "Recycle quote colors"
 msgstr "筝�絮や札筝�綣�荐�������茲�篏睡�����絎����蕁����"
 
-#: src/prefs_common.c:2728
+#: src/prefs_common.c:2729
 msgid "Pick color for quotation level 1"
 msgstr "��御��膃�筝�絮ゅ��荐����蕁����"
 
-#: src/prefs_common.c:2731
+#: src/prefs_common.c:2732
 msgid "Pick color for quotation level 2"
 msgstr "��御��膃�篋�絮ゅ��荐����蕁����"
 
-#: src/prefs_common.c:2734
+#: src/prefs_common.c:2735
 msgid "Pick color for quotation level 3"
 msgstr "��御��膃�筝�絮ゅ��荐����蕁����"
 
-#: src/prefs_common.c:2737
+#: src/prefs_common.c:2738
 msgid "Pick color for URI"
 msgstr "��御��莇���ｇ�����蕁����"
 
-#: src/prefs_common.c:2874
+#: src/prefs_common.c:2875
 msgid "Description of symbols"
 msgstr "��号��膃����篁ｈ；�����靸�"
 
-#: src/prefs_common.c:2930
+#: src/prefs_common.c:2931
 msgid ""
 "Date\n"
 "From\n"
@@ -4868,11 +4881,11 @@ msgstr ""
 "��域��臂ょ��\n"
 "篆＞散茘���ョ⊆"
 
-#: src/prefs_common.c:2943
+#: src/prefs_common.c:2944
 msgid "If x is set, displays expr"
 msgstr "��� x 綏画┃絎����蕁�腓阪幻荀頫�腓阪��"
 
-#: src/prefs_common.c:2947
+#: src/prefs_common.c:2948
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4886,7 +4899,7 @@ msgstr ""
 "綣�荐�鐚�筝����膂遵��鐚�\n"
 "% 膃����"
 
-#: src/prefs_common.c:2955
+#: src/prefs_common.c:2956
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4898,15 +4911,15 @@ msgstr ""
 "綏�紊ф��綣�\n"
 "�勀ぇ���綣�"
 
-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2993
 msgid "Font selection"
 msgstr "��御��絖����"
 
-#: src/prefs_common.c:3056
+#: src/prefs_common.c:3057
 msgid "Key bindings"
 msgstr "��演�笈┃絎�"
 
-#: src/prefs_common.c:3070
+#: src/prefs_common.c:3071
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4916,11 +4929,11 @@ msgstr ""
 "���箙����篁ユ�贋�号����������������演�居������Ū��荀�絨�羯�藜����罔��������ｻ鐚�\n"
 "筝����筝�篁私����球�喝�����"
 
-#: src/prefs_common.c:3082 src/prefs_common.c:3431
+#: src/prefs_common.c:3083 src/prefs_common.c:3432
 msgid "Default"
 msgstr "���荐����"
 
-#: src/prefs_common.c:3085 src/prefs_common.c:3440
+#: src/prefs_common.c:3086 src/prefs_common.c:3441
 msgid "Old Sylpheed"
 msgstr "���荐�絎�"
 
@@ -4988,190 +5001,185 @@ msgstr "篆＞散���羶乗┃絎�"
 msgid "Enabled"
 msgstr "綏臥�����"
 
-#: src/prefs_filter.c:757
+#: src/prefs_filter.c:758
 #, fuzzy, c-format
 msgid "Do you really want to delete the rule '%s'?"
 msgstr "���腆阪��荀������ら�����荀�������鐚�"
 
-#: src/prefs_filter.c:758
-#, fuzzy
-msgid "(Untitled)"
-msgstr "��≧��蕁�"
-
-#: src/prefs_filter.c:759
+#: src/prefs_filter.c:760
 msgid "Delete rule"
 msgstr "�����よ�����"
 
-#: src/prefs_filter_edit.c:338
+#: src/prefs_filter_edit.c:347
 msgid "Filter rule"
 msgstr "篆＞散���羶乗�����"
 
-#: src/prefs_filter_edit.c:371
+#: src/prefs_filter_edit.c:381
 msgid "If any of the following condition matches"
 msgstr "筝����篁私��罌�篁句�����"
 
-#: src/prefs_filter_edit.c:373
+#: src/prefs_filter_edit.c:383
 msgid "If all of the following conditions match"
 msgstr "筝����������罌�篁九��膃����"
 
-#: src/prefs_filter_edit.c:394
+#: src/prefs_filter_edit.c:404
 msgid "Perform the following actions:"
 msgstr "��決��筝�������篏�鐚�"
 
-#: src/prefs_filter_edit.c:562
+#: src/prefs_filter_edit.c:578
 msgid "To or Cc"
 msgstr "To ��� Cc"
 
-#: src/prefs_filter_edit.c:563
+#: src/prefs_filter_edit.c:579
 msgid "Any header"
 msgstr "篁私�����罔����"
 
-#: src/prefs_filter_edit.c:564
+#: src/prefs_filter_edit.c:580
 msgid "Edit header..."
 msgstr "膩�莠�篆＞散罔����..."
 
-#: src/prefs_filter_edit.c:567
+#: src/prefs_filter_edit.c:583
 msgid "Message body"
 msgstr "篆＞散��у��"
 
-#: src/prefs_filter_edit.c:568
+#: src/prefs_filter_edit.c:584
 msgid "Result of command"
 msgstr "��決��腟����"
 
-#: src/prefs_filter_edit.c:570
+#: src/prefs_filter_edit.c:586
 msgid "Age"
 msgstr "������"
 
-#: src/prefs_filter_edit.c:582
+#: src/prefs_filter_edit.c:599
 msgid "contains"
 msgstr "������"
 
-#: src/prefs_filter_edit.c:584
+#: src/prefs_filter_edit.c:601
 msgid "doesn't contain"
 msgstr "筝�������"
 
-#: src/prefs_filter_edit.c:586
+#: src/prefs_filter_edit.c:603
 msgid "is"
 msgstr "���"
 
-#: src/prefs_filter_edit.c:588
+#: src/prefs_filter_edit.c:605
 msgid "is not"
 msgstr "筝����"
 
-#: src/prefs_filter_edit.c:590
+#: src/prefs_filter_edit.c:607
 msgid "match to regex"
 msgstr "膃����絽梧�頫�腓阪��"
 
-#: src/prefs_filter_edit.c:592
+#: src/prefs_filter_edit.c:609
 msgid "doesn't match to regex"
 msgstr "筝�膃����絽梧�頫�腓阪��"
 
-#: src/prefs_filter_edit.c:600
+#: src/prefs_filter_edit.c:619
 msgid "is larger than"
 msgstr "紊ф��"
 
-#: src/prefs_filter_edit.c:601
+#: src/prefs_filter_edit.c:620
 msgid "is smaller than"
 msgstr "絨����"
 
-#: src/prefs_filter_edit.c:608
+#: src/prefs_filter_edit.c:629
 msgid "is longer than"
 msgstr "��傑��"
 
-#: src/prefs_filter_edit.c:609
+#: src/prefs_filter_edit.c:630
 msgid "is shorter than"
 msgstr "������"
 
-#: src/prefs_filter_edit.c:707
+#: src/prefs_filter_edit.c:729
 msgid "Move to"
 msgstr "腱糸�����"
 
-#: src/prefs_filter_edit.c:708
+#: src/prefs_filter_edit.c:730
 msgid "Copy to"
 msgstr "茲�茖遵��"
 
-#: src/prefs_filter_edit.c:709
+#: src/prefs_filter_edit.c:731
 msgid "Don't receive"
 msgstr "���腟��･��倶�や拭篁�"
 
-#: src/prefs_filter_edit.c:710
+#: src/prefs_filter_edit.c:732
 msgid "Delete from server"
 msgstr "���篌堺�����筝�������"
 
-#: src/prefs_filter_edit.c:713
+#: src/prefs_filter_edit.c:735
 msgid "Set mark"
 msgstr "荐�絎�罔�荐�"
 
-#: src/prefs_filter_edit.c:714
+#: src/prefs_filter_edit.c:736
 msgid "Set color"
 msgstr "荐�絎�蕁����"
 
-#: src/prefs_filter_edit.c:715
+#: src/prefs_filter_edit.c:737
 msgid "Mark as read"
 msgstr "罔�荐����綏画��"
 
-#: src/prefs_filter_edit.c:720
+#: src/prefs_filter_edit.c:742
 msgid "Forward as attachment"
 msgstr "絨�篆＞散��倶��������罟�莉�絲�"
 
-#: src/prefs_filter_edit.c:721
+#: src/prefs_filter_edit.c:743
 msgid "Redirect"
 msgstr "篆＞散絨����"
 
-#: src/prefs_filter_edit.c:725
+#: src/prefs_filter_edit.c:747
 msgid "Execute command"
 msgstr "��決����巡擦"
 
-#: src/prefs_filter_edit.c:728
+#: src/prefs_filter_edit.c:750
 msgid "Stop rule evaluation"
 msgstr "���罩∽�∽�ヨ�����"
 
-#: src/prefs_filter_edit.c:734 src/prefs_filter_edit.c:1058
+#: src/prefs_filter_edit.c:756 src/prefs_filter_edit.c:1080
 msgid "folder:"
 msgstr "莖����紊常��"
 
-#: src/prefs_filter_edit.c:1098
+#: src/prefs_filter_edit.c:1120
 msgid "address:"
 msgstr "篏����鐚�"
 
-#: src/prefs_filter_edit.c:1505
+#: src/prefs_filter_edit.c:1527
 msgid "Edit header list"
 msgstr "膩�莠�篆＞散罔����羝����"
 
-#: src/prefs_filter_edit.c:1528
+#: src/prefs_filter_edit.c:1550
 msgid "Headers"
 msgstr "篆＞散罔����"
 
-#: src/prefs_filter_edit.c:1539
+#: src/prefs_filter_edit.c:1561
 msgid "Header:"
 msgstr "篆＞散罔����鐚�"
 
-#: src/prefs_filter_edit.c:1655
+#: src/prefs_filter_edit.c:1677
 msgid "Rule name is not specified."
 msgstr "羃�������絎�荀�������腮�"
 
-#: src/prefs_filter_edit.c:1743 src/prefs_filter_edit.c:1822
-#: src/prefs_filter_edit.c:1830
+#: src/prefs_filter_edit.c:1765 src/prefs_filter_edit.c:1844
+#: src/prefs_filter_edit.c:1852
 msgid "Command is not specified."
 msgstr "���荐�絎���決�����篁�"
 
-#: src/prefs_filter_edit.c:1777
+#: src/prefs_filter_edit.c:1799
 msgid "Invalid condition exists."
 msgstr "���筝����羈����罌�篁�"
 
-#: src/prefs_filter_edit.c:1799 src/prefs_filter_edit.c:1807
+#: src/prefs_filter_edit.c:1821 src/prefs_filter_edit.c:1829
 msgid "Destination folder is not specified."
 msgstr "������莖����紊丈��荐�絎�"
 
-#: src/prefs_filter_edit.c:1861
+#: src/prefs_filter_edit.c:1883
 msgid "Invalid action exists."
 msgstr "���筝����羈������決�����篁�"
 
-#: src/prefs_filter_edit.c:1870
+#: src/prefs_filter_edit.c:1892
 msgid "Condition not exist."
 msgstr "���荐�絎�罌�篁�"
 
-#: src/prefs_filter_edit.c:1872
+#: src/prefs_filter_edit.c:1894
 msgid "Action not exist."
 msgstr "���絎�������篁や��絖����"
 
@@ -5426,56 +5434,56 @@ msgstr "��ｇ��筝�"
 msgid "Connecting to SMTP server: %s ..."
 msgstr "��ｇ����� SMTP 篌堺����� %s..."
 
-#: src/send_message.c:450
+#: src/send_message.c:455
 msgid "Sending HELO..."
 msgstr "������ HELO 罔����..."
 
-#: src/send_message.c:451 src/send_message.c:456 src/send_message.c:461
+#: src/send_message.c:456 src/send_message.c:461 src/send_message.c:466
 msgid "Authenticating"
 msgstr "茯�茘�"
 
-#: src/send_message.c:452 src/send_message.c:457
+#: src/send_message.c:457 src/send_message.c:462
 msgid "Sending message..."
 msgstr "�����坂拭篁銀賢..."
 
-#: src/send_message.c:455
+#: src/send_message.c:460
 msgid "Sending EHLO..."
 msgstr "������ EHLO 罔����..."
 
-#: src/send_message.c:464
+#: src/send_message.c:469
 msgid "Sending MAIL FROM..."
 msgstr "������ MAIL FROM 罔����..."
 
-#: src/send_message.c:465 src/send_message.c:469 src/send_message.c:474
+#: src/send_message.c:470 src/send_message.c:474 src/send_message.c:479
 msgid "Sending"
 msgstr "���篆＞賢"
 
-#: src/send_message.c:468
+#: src/send_message.c:473
 msgid "Sending RCPT TO..."
 msgstr "������ RCPT TO 罔����..."
 
-#: src/send_message.c:473
+#: src/send_message.c:478
 msgid "Sending DATA..."
 msgstr "�����坂拭篁区����� DATA..."
 
-#: src/send_message.c:477
+#: src/send_message.c:482
 msgid "Quitting..."
 msgstr "��∫��"
 
-#: src/send_message.c:505
+#: src/send_message.c:510
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "�����堺�育�灸散 (%d / %d bytes)"
 
-#: src/send_message.c:533
+#: src/send_message.c:538
 msgid "Sending message"
 msgstr "�����坂拭篁�"
 
-#: src/send_message.c:576 src/send_message.c:596
+#: src/send_message.c:581 src/send_message.c:601
 msgid "Error occurred while sending the message."
 msgstr "���篆≧����主�����茯ゃ��"
 
-#: src/send_message.c:579
+#: src/send_message.c:584
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -5782,120 +5790,120 @@ msgstr ""
 msgid "Creating summary view...\n"
 msgstr ""
 
-#: src/summaryview.c:579
+#: src/summaryview.c:578
 msgid "Process mark"
 msgstr "篆＞散罔�荐�"
 
-#: src/summaryview.c:580
+#: src/summaryview.c:579
 msgid "Some marks are left. Process it?"
 msgstr "���篋�篆＞散綏画←罔�荐����荀�膵主�����鐚�"
 
-#: src/summaryview.c:628
+#: src/summaryview.c:629
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "�����顚����紊�(%s)..."
 
-#: src/summaryview.c:919 src/summaryview.c:943
+#: src/summaryview.c:920 src/summaryview.c:944
 msgid "No more unread messages"
 msgstr "羃������銀�����莅�篆＞散"
 
-#: src/summaryview.c:920
+#: src/summaryview.c:921
 msgid "No unread message found. Search from the end?"
 msgstr "羃������上�井��莅�篆＞散���荀�緇�絨冗��膵主�����絨����鐚�"
 
-#: src/summaryview.c:929
+#: src/summaryview.c:930
 msgid "No unread messages."
 msgstr "羃�������莅�篆＞散"
 
-#: src/summaryview.c:944
+#: src/summaryview.c:945
 msgid "No unread message found. Go to next folder?"
 msgstr "羃�������莅�篆＞散���荀���遺��筝����莖����紊上��鐚�"
 
-#: src/summaryview.c:946 src/summaryview.c:1005
+#: src/summaryview.c:947 src/summaryview.c:1006
 msgid "Search again"
 msgstr "���罨≧��絨�"
 
-#: src/summaryview.c:978 src/summaryview.c:1002
+#: src/summaryview.c:979 src/summaryview.c:1003
 msgid "No more new messages"
 msgstr "羃������銀����遺拭篁�"
 
-#: src/summaryview.c:979
+#: src/summaryview.c:980
 msgid "No new message found. Search from the end?"
 msgstr "羃������上�井�遺拭篁吟��荀�緇�絨冗��膵主�����絨����鐚�"
 
-#: src/summaryview.c:988
+#: src/summaryview.c:989
 msgid "No new messages."
 msgstr "羃������遺拭篁�"
 
-#: src/summaryview.c:1003
+#: src/summaryview.c:1004
 msgid "No new message found. Go to next folder?"
 msgstr "羃������遺拭篁吟��荀���遺��筝����莖����紊上��鐚�"
 
-#: src/summaryview.c:1037 src/summaryview.c:1062
+#: src/summaryview.c:1038 src/summaryview.c:1063
 msgid "No more marked messages"
 msgstr "羃������銀��綏我��荐�篆＞散"
 
-#: src/summaryview.c:1038
+#: src/summaryview.c:1039
 msgid "No marked message found. Search from the end?"
 msgstr "羃������上�医群罔�荐�篆＞散���荀�緇�絨冗��膵主�����絨����鐚�"
 
-#: src/summaryview.c:1047 src/summaryview.c:1072
+#: src/summaryview.c:1048 src/summaryview.c:1073
 msgid "No marked messages."
 msgstr "羃����綏我��荐�篆＞散"
 
-#: src/summaryview.c:1063
+#: src/summaryview.c:1064
 msgid "No marked message found. Search from the beginning?"
 msgstr "羃������上�医群罔�荐�篆＞散���荀�緇�������膵主�����絨����鐚�"
 
-#: src/summaryview.c:1087 src/summaryview.c:1112
+#: src/summaryview.c:1088 src/summaryview.c:1113
 msgid "No more labeled messages"
 msgstr "羃����綏我��荐�蕁���俄��篆＞散"
 
-#: src/summaryview.c:1088
+#: src/summaryview.c:1089
 msgid "No labeled message found. Search from the end?"
 msgstr "羃������上�医群罔�荐�蕁���俄��篆＞散���荀�緇�絨冗��膵主�����絨����鐚�"
 
-#: src/summaryview.c:1097 src/summaryview.c:1122
+#: src/summaryview.c:1098 src/summaryview.c:1123
 msgid "No labeled messages."
 msgstr "羃����綏我��荐�蕁���俄��篆＞散"
 
-#: src/summaryview.c:1113
+#: src/summaryview.c:1114
 msgid "No labeled message found. Search from the beginning?"
 msgstr "羃������上�医群罔�荐�蕁���俄��篆＞散���荀�緇�������膵主�����絨����鐚�"
 
-#: src/summaryview.c:1322 src/summaryview.c:1324
+#: src/summaryview.c:1323 src/summaryview.c:1325
 msgid "Attracting messages by subject..."
 msgstr "絮����篆＞散筝�..."
 
-#: src/summaryview.c:1466
+#: src/summaryview.c:1467
 #, c-format
 msgid "%d deleted"
 msgstr "%d 綏峨�����"
 
-#: src/summaryview.c:1470
+#: src/summaryview.c:1471
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 綏牙Щ���"
 
-#: src/summaryview.c:1471 src/summaryview.c:1478
+#: src/summaryview.c:1472 src/summaryview.c:1479
 msgid ", "
 msgstr ""
 
-#: src/summaryview.c:1476
+#: src/summaryview.c:1477
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 綏画��茖�"
 
-#: src/summaryview.c:1493
+#: src/summaryview.c:1494
 msgid " item(s) selected"
 msgstr "絨�綏臥�御��"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1504
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 絨����莅�鐚�%d 絨�綏画��鐚���� %d 絨�(%s)"
 
-#: src/summaryview.c:1509
+#: src/summaryview.c:1510
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 絨����莅�鐚�%d 絨�綏画��鐚���� %d 絨�"
@@ -6066,6 +6074,9 @@ msgstr ""
 msgid "writing to %s failed.\n"
 msgstr "絲���ュ�� %s ������篏�紊掩�����\n"
 
+#~ msgid "Rebuilding all folder trees..."
+#~ msgstr "���綮堺�����莖����紊丞��罕�筝�..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/蕁�腓�(_V)/絖����(_C)/---"
 
diff --git a/src/codeconv.c b/src/codeconv.c
index cf6021d6..18fed44d 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -885,11 +885,25 @@ static gchar *conv_noconv(const gchar *inbuf, gint *error)
 	return g_strdup(inbuf);
 }
 
+static const gchar *
+conv_get_fallback_for_private_encoding(const gchar *encoding)
+{
+	if (encoding && (encoding[0] == 'X' || encoding[0] == 'x') &&
+	    encoding[1] == '-') {
+		if (!g_strcasecmp(encoding, CS_X_GBK))
+			return CS_GBK;
+	}
+
+	return encoding;
+}
+
 CodeConverter *conv_code_converter_new(const gchar *src_encoding,
 				       const gchar *dest_encoding)
 {
 	CodeConverter *conv;
 
+	src_encoding = conv_get_fallback_for_private_encoding(src_encoding);
+
 	conv = g_new0(CodeConverter, 1);
 	conv->code_conv_func =
 		conv_get_code_conv_func(src_encoding, dest_encoding);
@@ -916,39 +930,42 @@ gchar *conv_convert(CodeConverter *conv, const gchar *inbuf)
 }
 
 gchar *conv_codeset_strdup_full(const gchar *inbuf,
-				const gchar *src_code, const gchar *dest_code,
+				const gchar *src_encoding,
+				const gchar *dest_encoding,
 				gint *error)
 {
 	CodeConvFunc conv_func;
 
-	conv_func = conv_get_code_conv_func(src_code, dest_code);
+	src_encoding = conv_get_fallback_for_private_encoding(src_encoding);
+
+	conv_func = conv_get_code_conv_func(src_encoding, dest_encoding);
 	if (conv_func != conv_noconv)
 		return conv_func(inbuf, error);
 
-	return conv_iconv_strdup(inbuf, src_code, dest_code, error);
+	return conv_iconv_strdup(inbuf, src_encoding, dest_encoding, error);
 }
 
-CodeConvFunc conv_get_code_conv_func(const gchar *src_charset_str,
-				     const gchar *dest_charset_str)
+CodeConvFunc conv_get_code_conv_func(const gchar *src_encoding,
+				     const gchar *dest_encoding)
 {
 	CodeConvFunc code_conv = conv_noconv;
 	CharSet src_charset;
 	CharSet dest_charset;
 
-	if (!src_charset_str)
+	if (!src_encoding)
 		src_charset = conv_get_locale_charset();
 	else
-		src_charset = conv_get_charset_from_str(src_charset_str);
+		src_charset = conv_get_charset_from_str(src_encoding);
 
 	/* auto detection mode */
-	if (!src_charset_str && !dest_charset_str) {
+	if (!src_encoding && !dest_encoding) {
 		if (src_charset == C_EUC_JP || src_charset == C_SHIFT_JIS)
 			return conv_anytodisp;
 		else
 			return conv_noconv;
 	}
 
-	dest_charset = conv_get_charset_from_str(dest_charset_str);
+	dest_charset = conv_get_charset_from_str(dest_encoding);
 
 	if (dest_charset == C_US_ASCII)
 		return conv_ustodisp;
@@ -1201,7 +1218,7 @@ static const struct {
 	{"ko_KR.EUC-KR"	, C_EUC_KR	, C_EUC_KR},
 	{"ko_KR"	, C_EUC_KR	, C_EUC_KR},
 	{"zh_CN.GB2312"	, C_GB2312	, C_GB2312},
-	{"zh_CN.GBK"	, C_GBK		, C_GB2312},
+	{"zh_CN.GBK"	, C_GBK		, C_GBK},
 	{"zh_CN"	, C_GB2312	, C_GB2312},
 	{"zh_HK"	, C_BIG5_HKSCS	, C_BIG5_HKSCS},
 	{"zh_TW.eucTW"	, C_EUC_TW	, C_BIG5},
@@ -1560,6 +1577,7 @@ gboolean conv_is_multibyte_encoding(CharSet encoding)
 	case C_ISO_2022_CN:
 	case C_SHIFT_JIS:
 	case C_GB2312:
+	case C_GBK:
 	case C_BIG5:
 	case C_UTF_8:
 	case C_UTF_7:
diff --git a/src/codeconv.h b/src/codeconv.h
index 44a4976f..c17cd84c 100644
--- a/src/codeconv.h
+++ b/src/codeconv.h
@@ -158,6 +158,7 @@ struct _CodeConverter
 #define CS_EUC_CN		"EUC-CN"
 #define CS_GB2312		"GB2312"
 #define CS_GBK			"GBK"
+#define CS_X_GBK		"X-GBK"
 #define CS_EUC_TW		"EUC-TW"
 #define CS_BIG5			"Big5"
 #define CS_BIG5_HKSCS		"BIG5-HKSCS"
@@ -188,16 +189,16 @@ gchar *conv_convert			(CodeConverter	*conv,
 	(conv_codeset_strdup_full(inbuf, src_code, dest_code, NULL))
 
 gchar *conv_codeset_strdup_full		(const gchar	*inbuf,
-					 const gchar	*src_code,
-					 const gchar	*dest_code,
+					 const gchar	*src_encoding,
+					 const gchar	*dest_encoding,
 					 gint		*error);
 
-CodeConvFunc conv_get_code_conv_func	(const gchar	*src_charset_str,
-					 const gchar	*dest_charset_str);
+CodeConvFunc conv_get_code_conv_func	(const gchar	*src_encoding,
+					 const gchar	*dest_encoding);
 
 gchar *conv_iconv_strdup		(const gchar	*inbuf,
-					 const gchar	*src_code,
-					 const gchar	*dest_code,
+					 const gchar	*src_encoding,
+					 const gchar	*dest_encoding,
 					 gint		*error);
 gchar *conv_iconv_strdup_with_cd	(const gchar	*inbuf,
 					 iconv_t	 cd,
diff --git a/src/compose.c b/src/compose.c
index b685386b..1e864ddd 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -647,6 +647,8 @@ static GtkItemFactoryEntry compose_entries[] =
 
 	{N_("/_View/Character _encoding/Simplified Chinese (_GB2312)"),
 	 ENC_ACTION(C_GB2312)},
+	{N_("/_View/Character _encoding/Simplified Chinese (GBK)"),
+	 ENC_ACTION(C_GBK)},
 	{N_("/_View/Character _encoding/Traditional Chinese (_Big5)"),
 	 ENC_ACTION(C_BIG5)},
 	{N_("/_View/Character _encoding/Traditional Chinese (EUC-_TW)"),
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 7675b758..d785a309 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -625,6 +625,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
 
 	{N_("/_View/Character _encoding/Simplified Chinese (_GB2312)"),
 	 ENC_ACTION(C_GB2312)},
+	{N_("/_View/Character _encoding/Simplified Chinese (GBK)"),
+	 ENC_ACTION(C_GBK)},
 	{N_("/_View/Character _encoding/Traditional Chinese (_Big5)"),
 	 ENC_ACTION(C_BIG5)},
 	{N_("/_View/Character _encoding/Traditional Chinese (EUC-_TW)"),
diff --git a/src/messageview.c b/src/messageview.c
index 9c01b036..f06d7062 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -200,6 +200,8 @@ static GtkItemFactoryEntry msgview_entries[] =
 	ENC_SEPARATOR,
 	{N_("/_View/Character _encoding/Simplified Chinese (_GB2312)"),
 	 ENC_ACTION(C_GB2312)},
+	{N_("/_View/Character _encoding/Simplified Chinese (GBK)"),
+	 ENC_ACTION(C_GBK)},
 	{N_("/_View/Character _encoding/Traditional Chinese (_Big5)"),
 	 ENC_ACTION(C_BIG5)},
 	{N_("/_View/Character _encoding/Traditional Chinese (EUC-_TW)"),
diff --git a/src/prefs_common.c b/src/prefs_common.c
index 372ac3d3..7197142b 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -1159,6 +1159,7 @@ static void prefs_send_create(void)
 #endif /* 0 */
 	SET_MENUITEM(NULL, NULL);
 	SET_MENUITEM(_("Simplified Chinese (GB2312)"),	 CS_GB2312);
+	SET_MENUITEM(_("Simplified Chinese (GBK)"),	 CS_GBK);
 	SET_MENUITEM(_("Traditional Chinese (Big5)"),	 CS_BIG5);
 #if 0
 	SET_MENUITEM(_("Traditional Chinese (EUC-TW)"),  CS_EUC_TW);