updated po files.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3543 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2017-02-20 04:53:00 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2017-02-20 04:53:00 +0000
commit: 84423b4b69f7c0659742730f84a05702b29104bf (patch)
tree: e4378d51ebfa1daca3724c5ee4d17a31294c559b
parent: 79263ce504bc39f88164c9ce1d08e2f8b2b45c40 (diff)
33 files changed, 19555 insertions, 18463 deletions
diff --git a/po/be.po b/po/be.po
index 22d5fdb0..8a8b03d4 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2010-06-20 15:36+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -25,202 +25,207 @@ msgstr "Фільтр непажаданай пошты (ручны)"
 msgid "Junk mail filter"
 msgstr "Фільтр непажаданай пошты"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Злучэнне IMAP4 з %s было разарвана. Перазлучэнне...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Сервер IMAP4 не дазваляе LOGIN.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "Немагчыма устанавіць злучэнне IMAP4.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "стварэнне злучэнне IMAP4 з %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Нельга пачаць сеанс TLS.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(атрыманне FLAGS...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "Атрыманне паведамлення %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Далучэнне паведамлення да %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Перанос паведамленняў %s у %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Капіраванне паведамленняў %s у %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Сціранне паведамленняў %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "нельга ўстанавіць флагі сцірання: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "нельга выкрасліць\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Сціранне ўсіх паведамленняў з %s..."
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "нельга ўстанавіць флагі сцірання: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "нельга закрыць каталог\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "каталог кораню %s не існуе\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "памылка здарылася падчас атрымання LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Нельга стварыць `%s'\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Нельга стварыць '%s' у INBOX\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "нельга стварыць скрынку: LIST схібіў\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "нельга стварыць скрынку\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "нельга стварыць скрынку\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "нельга перайменаваць скрынку: %s у %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "нельга сцерці скрынку\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Атрыманне загалоўкаў паведамлення (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "памылка здарылася падчас атрымання канверта.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "немагчыма разабраць канверт: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "нельга атрымаць канверт\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Немагчыма злучыцца з серверам IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Немагчыма устанавіць сеанс IMAP4 з: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "нельга атрымаць прастору імён\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "нельга выбраць каталог: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "памылка пры выкананні загаду imap: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "Аўтэнтыфікацыя IMAP4 схібіла.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Уваход на сервер IMAP4 схібіў.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "нельга далучыць %s да %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(адпраўленне файла...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "нельга далучыць паведамленне да %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "нельга скапіраваць %s у %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "памылка пры выкананні загаду imap: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "памылка пры выкананні загаду imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "памылка пры выкананні загаду imap: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не можа канверсаваць UTF-7 у %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не можа канверсаваць %s у UTF-7\n"
@@ -496,7 +501,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "памылка здарылася падчас сеансу POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "не атрымалася запісаць канфігурацыю ў файл\n"
@@ -548,50 +553,50 @@ msgstr "няправільны водгук SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "памылка падчас сеансу SMTP\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 недаступны\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 даступны\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 недаступны\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 даступны\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "Недаступны метад SSL\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Невядомы метад SSL *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Памылка стварэння кантэксту ssl\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Злучэнне SSL з ужываннем %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Сертыфікат сервера:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr " Тэма: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Выдавец: %s\n"
@@ -650,7 +655,7 @@ msgstr ""
 "гэтай праграмай; калі гэтага не адбылося, напішыце ў Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -687,14 +692,14 @@ msgstr ""
 "ў слупку `G' акаунты, якія задзейнічаюць атрыманне лістоў праз `Атр. усе'"
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Назва"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Пратакол"
 
@@ -822,13 +827,13 @@ msgstr "Карыстальніцкі аргумент дзеяння"
 msgid "Add Address to Book"
 msgstr "Дадаць Адрас у Кнігу"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Адрас"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Заўвагі"
 
@@ -840,7 +845,7 @@ msgstr "Выберыце каталог Адраснай кнігі"
 msgid "Auto-registered address"
 msgstr "Аўта-рэгістраваныя адрасы"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/Ф_айл"
@@ -861,10 +866,10 @@ msgstr "/Ф_айл/Новы _J-Pilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/Ф_айл/Новы сервер _LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/Ф_айл/---"
@@ -881,21 +886,21 @@ msgstr "/Ф_айл/_Сцерці"
 msgid "/_File/_Save"
 msgstr "/Ф_айл/За_пісаць"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/Ф_айл/Закры_ць"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Правіць"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Правіць/Капірава_ць"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Правіць/_Уставіць"
 
@@ -939,7 +944,7 @@ msgstr "/_Адрас/_Рэдагаваць"
 msgid "/_Address/_Delete"
 msgstr "/_Адрас/Сц_ерці"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Прылады"
@@ -952,12 +957,12 @@ msgstr "/_Прылады/Імпартаваць файл _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Прылады/Імпартаваць файл _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Даведка"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Даведка/_Пра Sylpheed"
@@ -975,7 +980,7 @@ msgid "/New _Folder"
 msgstr "/Новы к_аталог"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1017,7 +1022,7 @@ msgstr "Адрасная кніга"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Каталог"
 
@@ -1029,17 +1034,17 @@ msgstr "Адрас эл.пошты"
 msgid "Search:"
 msgstr "Пошук:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Каму:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Скрытая копія:"
@@ -1246,7 +1251,7 @@ msgstr "Супольны адрас"
 msgid "Personal address"
 msgstr "Асабовы адрас"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Заўвага"
 
@@ -1302,392 +1307,397 @@ msgstr "Карычневы"
 msgid "None"
 msgstr "Няма"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Адкрыць"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/Дадаць..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/Сц_ерці"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Уласцівасці..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/Ф_айл/В_ыслаць"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/Ф_айл/Выс_лаць пазней"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/Ф_айл/Запісаць у каталог чарна_вікоў"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/Ф_айл/Запісаць і рэдагаваць да_лей"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/Ф_айл/Далучыць _файл"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/Ф_айл/_Уставіць файл"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/Ф_айл/Уставіць _подпіс"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/Ф_айл/_Далучыць подпіс"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Правіць/А_дкаціць"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Правіць/_Узнавіць"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Правіць/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Правіць/_Выразаць"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Правіць/Уставіць як _цытату"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Правіць/Вылучыць _усё"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Правіць/Завярну_ць бягучы параграф"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Правіць/Перанесці усе _доўгія радкі"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Правіць/А_ўтаперанос"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/Выгляд"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/Выгляд/_Каму"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/Выгляд/_Копія"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/Выгляд/Скрытая коп_ія"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/Выгляд/Зваротны адрас"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/Выгляд/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/Выгляд/Узыходзіць д_а"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/Выгляд/_Лінейка"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/Выгляд/Дадатак"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Выгляд/Наставіць стужку пр_ылад..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/Выгляд/Знаказбор"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Выгляд/Знаказбор/Аўтаматычна"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/Выгляд/Знаказбор/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Выгляд/Знаказбор/7-бітны ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Выгляд/Знаказбор/Унікод (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Выгляд/Знаказбор/Заходнееўрапейскі (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Выгляд/Знаказбор/Заходнееўрапейскі (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Выгляд/Знаказбор/Цэнтральнаеўрапейскі (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Выгляд/Знаказбор/_Балтыйскі (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Выгляд/Знаказбор/Балтыйскі (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Выгляд/Знаказбор/Балтыйскі (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Выгляд/Знаказбор/Грэчаскі (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Выгляд/Знаказбор/Арабскі (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Выгляд/Знаказбор/Арабскі (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Выгляд/Знаказбор/Яўрэйскі (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Выгляд/Знаказбор/Яўрэйскі (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Выгляд/Знаказбор/Турэцкі (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Выгляд/Знаказбор/Кірыліца (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Выгляд/Знаказбор/Японскі (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Выгляд/Знаказбор/Спрошчаны Кітайскі (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Выгляд/Знаказбор/Спрошчаны Кітайскі (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Выгляд/Знаказбор/Традыцыйны Кітайскі (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Выгляд/Знаказбор/Карэйскі (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Выгляд/Знаказбор/Тайскі (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Выгляд/Знаказбор/Тайскі (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Прылады/_Адрасная кніга"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Прылады/_Шаблон"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Прылады/Дзеянні"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Прылады/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Прылады/Рэдагаваць вонкавым рэдактарам"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Прылады/Зап_ыт пацверджання атрымання"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Прылады/_Подпіс PGP"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Прылады/_Шыфр GPG"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Прылады/Правяраць правапі_с"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Прылады/_Наставіць мову"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існуе\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Нельга атрымаць частку тэксту\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Памылка фармату пазнакі цытаты."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Памылка фармату адказу/перасылкі паведамлення."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існуе\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Нельга атрымаць памер файла %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пусты."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Нельга прачытаць %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Паведамленне: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Нельга атрымаць частку складанага паведамлення."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Без Тэмы)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Напісанне%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Подпіс"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Не указаны атрымальнік."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Пустая тэма"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тэма не азначаная. Выслаць як ёсць?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Адсутнічаюць дадаткі"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Ліст не мае дадаткаў. Выслаць яго без дадаткаў?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Праверыць атрымальнікаў"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Насамрэч даслаць гэты ліст на наступныя адрасы?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Адпраўнік:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Тэма:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "Адпра_віць"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
@@ -1695,11 +1705,11 @@ msgstr ""
 "Зараз выконваецца праверка новых паведамленняў.\n"
 "Калі ласка, паспрабуйце пазней."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "нельга атрымаць спіс рэспандэнтаў."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1707,12 +1717,12 @@ msgstr ""
 "Не указаны уліковы рахунак для адпраўкі пошты.\n"
 "Калі ласка, выберыце акаунт перад адпраўленнем."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Памылка пад час адпраўкі паведамлення да %s."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
@@ -1720,29 +1730,29 @@ msgstr ""
 "Адпраўленне паведамлення скончана, але гэта паведамленне немагчыма запісаць "
 "у дасланыя."
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Не знойдзена ніводнага ключа, асацыяванага з выбраным ідэнтыфікатарам `%s'."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "Нельга падпісаць паведамленне."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "Нельга зашыфраваць паведамленне."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "Нельга зашыфраваць ці падпісаць паведамленне."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "нельга змяніць рэжым файла\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1753,11 +1763,11 @@ msgstr ""
 "\n"
 "Выслаць у %s, як ёсць?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Памылка канверсіі коду"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1770,15 +1780,15 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Ліміт даўжыні радка"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Шыфраваць з `Bcc'"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1792,94 +1802,104 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "нельга сцерці старое паведамленне\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "даданне паведамлення ў чаргу...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "не знойдзены каталог чаргі\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "нельга змясціць паведамленне ў чаргу\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існуе."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Нельга адкрыць файл %s."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Стварэнне вакна напісання...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Подпіс PGP"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "Шыфр PGP"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Тып звестак"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Памер"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Подпіс"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Праверка подпісу"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Няправільны тып MIME."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існуе ці пусты."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Уласцівасці"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "тып MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Кадаванне"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Назва файла"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "Файл не існуе."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Адкрыццё выканальнага файла"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1890,12 +1910,12 @@ msgstr ""
 "Калі вы жадаеце запусціць яго, запішыце дзе-небудзь, і ўпэўніцеся, што гэта "
 "не вірус ці нешта кшталту шкодных праграм."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Няправільны радок загаду для вонкавага рэдактара: `%s'\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1904,48 +1924,48 @@ msgstr ""
 "Вонкавы рэдактар яшчэ працуе.\n"
 "Скончыць працэс гвалтоўна (pid: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "На_ставіць стужку прылад..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Нельга змясціць паведамленне ў чаргу."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Выбраць файлы"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Выбраць файл"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Запісаць паведамленне"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Гэта паведамленне было зменена. Запісаць у каталог чарнавікоў?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Закры_ць без запісу"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Жадаеце ужыць шаблон `%s'?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Ужыць шаблон"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Замяніць"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Уставіць"
 
@@ -1986,7 +2006,7 @@ msgid "Nick Name"
 msgstr "Псеўданім"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-Mail адрас"
 
@@ -2044,7 +2064,7 @@ msgid " Check File "
 msgstr " Праверыць файл"
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Файл"
 
@@ -2052,62 +2072,62 @@ msgstr "Файл"
 msgid "Add New Address Book"
 msgstr "Дадаць новую Адрасную кнігу"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Трэба ўказаць Назву Групы."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Рэдагаваць звесткі групы"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Назва Групы"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Даступныя Адрасы"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Адрасы ў Групе"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Пераносьце адрасы эл.пошты да (з) Групы кнопкамі са стрэлкамі"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Змяніць дэталі Групы"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Дадаць новую Групу"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Рэдагаваць каталог"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Увядзіце новую назву каталога:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Новы каталог"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Увядзіце назву новага каталога:"
 
@@ -2124,7 +2144,7 @@ msgid "Edit JPilot Entry"
 msgstr "Змяніць запіс JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2189,7 +2209,7 @@ msgstr "Таймаут (сек)"
 msgid "Maximum Entries"
 msgstr "Максімум запісаў"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Базавыя"
 
@@ -2275,7 +2295,7 @@ msgid "MH (number only)"
 msgstr "MH (толькі нумар)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Выбраць... "
 
@@ -2458,12 +2478,12 @@ msgstr "Устанаўленне інфармацыі па каталогу...\n
 msgid "Setting folder info..."
 msgstr "Устанаўленне інфармацыі па каталогу..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Прагляд каталога %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканаванне каталога %s ..."
@@ -3287,682 +3307,692 @@ msgstr ""
 "Знойдзена папярэдняя версія канфігурацыі.\n"
 "Жадаеце міграваць на яе?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/Ф_айл/К_аталог"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Ф_айл/К_аталог/С_тварыць новы каталог..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Ф_айл/К_аталог/Перайменаваць _каталог..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/Ф_айл/К_аталог/Перанес_ьці каталог..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Ф_айл/К_аталог/Сц_ерці каталог"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/Ф_айл/Скрынка"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Ф_айл/Скрынка/Дадаць скрынку..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Ф_айл/Скрынка/Сцерці с_крынку"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/Ф_айл/Скрынка/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Ф_айл/Скрынка/Праверыць новыя лі_сты"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Ф_айл/Скрынка/Праверыць новую пошту ва ўсіх скрынках"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Ф_айл/Скрынка/Перасабраць дрэва каталогаў"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/Ф_айл/Імпартаваць по_шту..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/Ф_айл/Экспартаваць пошт_у..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/Ф_айл/Ачысціць см_етніцы"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/Ф_айл/Запісаць як..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/Ф_айл/Настаўленні аркуша..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/Ф_айл/_Друкаваць..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/Ф_айл/Пра_цаваць па-за сеткай"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/Ф_айл/Вы_йсці"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Правіць/Вылучыць нітку"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Правіць/Зн_айсці ў бягучым лісце..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Правіць/Знайсці паведамленні..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/_Правіць/Х_уткі пошук"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/Выгляд/Паказаць або сха_ваць"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Выгляд/Паказаць або сха_ваць/Дрэв_а каталогаў"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Выгляд/Паказаць або сха_ваць/Прагляд ліста"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Выгляд/Паказаць або сха_ваць/Стужка прылад"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Выгляд/Паказаць або сха_ваць/Стужка прылад/Іконкі і тэкст"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/Выгляд/Паказаць або сха_ваць/Стужка прылад/Тэкст справа ад і_конак"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Выгляд/Паказаць або сха_ваць/Стужка прылад/Іконкі"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Выгляд/Паказаць або сха_ваць/Стужка прылад/Тэкст"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Выгляд/Паказаць або сха_ваць/Стужка прылад/Нічога"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Выгляд/Паказаць або сха_ваць/Стужка пошуку"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Выгляд/Паказаць або сха_ваць/Стужка статусу"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/Выгляд/На_ставіць стужку прылад..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/Выгляд/Вы_клад"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/Выгляд/Вы_клад/_Звычайны"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/Выгляд/Вы_клад/_Вертыкальны"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/Выгляд/Аддзеленае дрэва каталога_ў"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/Выгляд/Аддзелены прагляд лістоў"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/Выгляд/Парадка_ванне"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/Выгляд/Парадка_ванне/па нумару"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Выгляд/Парадка_ванне/па памеру"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/Выгляд/Парадка_ванне/па даце"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Выгляд/Парадка_ванне/па даце абме_ркавання"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/Выгляд/Парадка_ванне/па _Адпраўніку"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Выгляд/Парадка_ванне/па Адрасату"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/Выгляд/Парадка_ванне/па тэме"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/Выгляд/Парадка_ванне/па колеру"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/Выгляд/Парадка_ванне/па марцы"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/Выгляд/Парадка_ванне/па нечытаным"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Выгляд/Парадка_ванне/па дадаткам"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Выгляд/Парадка_ванне/Не парадкаваць"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/Выгляд/Парадка_ванне/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/Выгляд/Парадка_ванне/Да павелічэння"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/Выгляд/Парадка_ванне/Да памяншэння"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Выгляд/Парадка_ванне/Сцягваць тэмай"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/Выгляд/Прагляд ніта_к абмеркавання"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/Выгляд/Разгарнуць усе ніткі"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/Выгляд/Згарнуць усе ніткі"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/Выгляд/Паказваць элементы..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/Выгляд/Ісці да"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Выгляд/Ісці да/Папярэдні ліст"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/Выгляд/Ісці да/Нас_тупны ліст"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/Выгляд/Ісці да/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Выгляд/Ісці да/Папярэдні нечытаны ліст"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Выгляд/Ісці да/Наступны нечытаны ліст"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Выгляд/Ісці да/Папярэдні новы ліст"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Выгляд/Ісці да/Наступны новы ліст"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Выгляд/Ісці да/Папярэдні маркіраваны ліст"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Выгляд/Ісці да/Наступны маркіраваны ліст"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Выгляд/Ісці да/Папярэдні памечаны ліст"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Выгляд/Ісці да/Наступны памечаны л_іст"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Выгляд/Ісці да/Другі к_аталог..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Выгляд/Знаказбор/Аўтавызначэнне"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Выгляд/Знаказбор/Заходнееўрапейскі (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Выгляд/Знаказбор/Японскі (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Выгляд/Знаказбор/Японскі (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Выгляд/Знаказбор/Японскі (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Выгляд/Знаказбор/Традыцыйны Кітайскі (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Выгляд/Знаказбор/Кітайскі (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Выгляд/Знаказбор/Карэйскі (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/Выгляд/Адкры_ць у новым акне"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/Выгляд/Выточны тэкст паведамлення"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/Выгляд/Усе загалоўкі"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/Выгляд/Абнавіць зводку"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/Ліст"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/Ліст/Атры_маць"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Ліст/Атры_маць/Атрымаць для бягучага акаунта"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Ліст/Атры_маць/Атрымаць для ўсіх акаунтаў"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/Ліст/Атры_маць/С_пыніць атрыманне"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/Ліст/Атры_маць/Адлеглая с_крыня..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/Ліст/Атры_маць/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/Ліст/В_ыслаць лісты з чаргі"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/Ліст/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/Ліст/Напісаць новы ліс_т"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/Ліст/Ад_казаць"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/Ліст/Адказ"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Ліст/Адказ/ўсім"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Ліст/Адказ/адпраўніку"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Ліст/Адказ/у спіс рассылкі"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/Ліст/Пер_аслаць"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/Ліст/Перасла_ць як дадатак"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/Ліст/П_еранакіраваць"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/Ліст/Перанесці..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/Ліст/Капіраваць"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/Ліст/_Пазначэнне"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/Ліст/_Пазначэнне/Д_адаць сцяг"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/Ліст/_Пазначэнне/Зняць сцяг"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/Ліст/_Пазначэнне/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Ліст/_Пазначэнне/Пазначыць як нечытаны"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Ліст/_Пазначэнне/Пазначыць як прачытаны"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Ліст/_Пазначэнне/Пазначыць абм_еркаванне як прачытанае"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Ліст/_Пазначэнне/Пазначыць усе як прачытаныя"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/Ліст/С_церці"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/Ліст/Пазначыць як _Спам"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Ліст/Пазначыць як _не-Спам"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/Ліст/Пера-рэдагаваць"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Прылады/Дадаць адпраўніка ў адрасную кнігу..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Прылады/Фільтр_аваць усе лісты ў каталогу"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Прылады/Фільтраваць в_ылучаныя лісты"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Прылады/_Стварыць правіла фільтра"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Прылады/_Стварыць правіла фільтра/Аўтаматычна"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Прылады/_Стварыць правіла фільтра/па _Адпраўніку"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Прылады/_Стварыць правіла фільтра/па _Адрасату"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Прылады/_Стварыць правіла фільтра/па _Тэме"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Прылады/Фільтраваць Спам у катал_огу"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Прылады/Фільтравац_ь Спам у вылучаных лістах"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Прылады/Сцерці падвоеныя паведамленні"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/Прылады/Аб'я_днаць падзеленыя паведамленні"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/Прылады/Выканаць пазна_чаныя дзеянні"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Прылады/Фільтраваць Спам у катал_огу"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Прылады/Фільтр_аваць усе лісты ў каталогу"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Прылады/Акно _журнала"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/Канфігурацыя"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Канфігурацыя/Агульныя на_стаўленні..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/Канфігурацыя/Н_аставіць фільтр..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/Канфігурацыя/Шаблон..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/Канфігурацыя/Дзеянні..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/Канфігурацыя/Распараднік плагінаў..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/Канфігурацыя/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Канфігурацыя/Наста_ўленні бягучага акаунта..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/Канфігурацыя/С_тварыць новы акаунт..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Канфігурацыя/Рэдагаваць ака_унты..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/Канфігурацыя/Змяніць бягучы акаунт"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Даведка/_Кіраўніцтва"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Даведка/_Кіраўніцтва/Англійскае"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Даведка/_Кіраўніцтва/Яп_онскае"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/Даведка/_FAQ"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Даведка/_FAQ/Англійскі"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Даведка/_FAQ/_Нямецкі"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Даведка/_FAQ/Іспанскі"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Даведка/_FAQ/Фр_анцузскі"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Даведка/_FAQ/_Італьянскі"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Даведка/_Опцыі загаднага радка"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Даведка/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/_Даведка/Спраўдзіць _новую версію..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/_Даведка/Праверыць абнаўленні плагінаў..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Стварэнне галоўнага вакна...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: размяшчэнне колеру %d схібіла\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "зроблена.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Неназваны"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "няма"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Без злучэння"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Вы не злучаны. Злучыцца?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Ачысціць сметніцу"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Сцерці усе паведамленні ў каталогах-сметніцах?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Дадаць скрынку"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3972,16 +4002,16 @@ msgstr ""
 "Калі ўказаць наяўную скрынку, яна будзе\n"
 "прасканавана аўтаматычна."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скрынка `%s' ужо існуе."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Скрынка"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3990,95 +4020,95 @@ msgstr ""
 "Стварэнне паштовай скрынкі схібіла.\n"
 "Магчыма, файлы ўжо існуюць, ці вы не маеце дазволу на запіс у тым месцы."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Сілфід - Прагляд Каталогаў"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Сілфід - Прагляд Паведамлення"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/Ад_казаць"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Адказаць усім"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Адказаць адпраўніку"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/А_дказаць у спіс рассылкі"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/Пер_аправіць"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Перасла_ць як дадатак"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Перанакіраваць"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Іконкі і тэкст"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Тэкст справа ад і_конак"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "Іконкі"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "Тэкст"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "Нічога"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Вы не злучаныя. Клікніце іконку, каб злучыцца."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы ў злучэнні. Клікніце іконку, каб адлучыцца."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Выхад"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Выйсці з праграмы?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "Вылучаныя паведамленні не могуць быць аб'яднаныя."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Выберыце каталог"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Опцыі загаднага радка"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Ужыванне: sylpheed [ОПЦЫЯ]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4111,7 +4141,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4144,15 +4174,15 @@ msgstr ""
 "паказаць гэту даведку і выйсці\n"
 "паказаць звесткі пра версію і выйсці"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Опцыі толькі для аконнага рэжыму:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport нум_порта"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "задаць порт для аддаленых загадаў IPC"
 
@@ -4386,236 +4416,236 @@ msgstr "Файл: "
 msgid "Description: "
 msgstr "Апісанне: "
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Адкрыццё вакна пераважанняў акаунта...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Акаунт%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Настаўленні новага акаунта"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Настаўленні акаунта"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Стварэнне вакна пераважанняў акаунта...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Атрыманне"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Адпраўка"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Напісанне"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Прыватнасць"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Проксі"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Адмысловыя"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Назва гэтага акаунта"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Пазначыць тыповым"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Асабовая інфармацыя"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Поўнае імя"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Паштовы адрас"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Арганізацыя"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Інфармацыя аб серверы"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Навіны (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Няма (лакальны)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Гэты сервер патрабуе аўтэнтыфікацыю"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Сервер навін"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Сервер для атрымання"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "SMTP-сервер (адпраўка)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "ID карыстальніка"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Пароль"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Ужываць бяспечную аўтэнтыфікацыю (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Сціраць лісты з сервера па атрыманні"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Сціраць пасля"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "дзён"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "(0 дзён: сціраць неадкладна)"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Загружаць усе паведамленні (таксама ўжо атрыманыя) з сервера"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Ліміт памеру атрымання"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "КБ"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Фільтраваць лісты падчас атрымання"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Тыповы inbox"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Неадфільтраваныя лісты застануцца ў гэтым каталогу."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Метад аўтэнтыфікацыі"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Аўтаматычна"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Правяраць толькі INBOX падчас атрымання"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Фільтраваць новыя лісты ў INBOX падчас атрымання"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Навіны"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Максімум артыкулаў для загрузкі"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Без абмежавання, калі указаны 0."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Атр.усе' правярае новыя паведамленні для гэтага акаунта"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Загаловак"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Дадаць поле Дата да загалоўка"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Генераваць Message-ID"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Дадаць загаловак, зададзены карыстальнікам"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Рэдагаваць..."
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Аўтэнтыфікацыя"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Аўтэнтыфікацыя SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4623,241 +4653,245 @@ msgstr ""
 "Калі вы пакінеце гэтыя палі пустымі, будуць ужытыя тыя ж ID карыстальніка і "
 "пароль, што і для атрымання."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Аўтэнтыфікацыя POP3 перад адпраўленнем"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Подпіс"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Непасрэдны ўвод"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Назва:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Вывад загада"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Паставіць подпіс перад цытатай (не рэкамендуецца)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Аўтаматычна ўпісваць наступныя адрасы"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Копія"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Скрытая копія"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Зваротны адрас"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "Тыпова падпісваць паведамленні PGP"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "Тыпова шыфраваць паведамленні PGP"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Шыфраваць пры адказе на шыфраванае паведамленне"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "нельга атрымаць спіс рэспандэнтаў."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Ужываць фармат ASCII-armored для шыфравання"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Устаўляць подпіс чыстым тэкстам"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Ужываць тыповы ключ GnuPG"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Выбар ключа праз свой адрас эл.пошты"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Задаць ключ самастойна"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "ID карыстальніка ці ключа:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Не ўжываць SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Ужываць SSL для злучэння POP3"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Ужываць загад STARTTLS, каб пачаць сеанс SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Ужываць SSL для злучэння IMAP4"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Ужываць SSL для злучэння NNTP"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Адпраўка (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Ужываць SSL для злучэння SMTP"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Ужываць не-блакавальны SSL"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Выключце гэта, калі маеце праблемы з SSL злучэннем."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "Ужываць SOCKS proxy"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Назва хоста:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Ужываць аўтэнтыфікацыю"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Назва:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Ужываць SOCKS-проксі для адпраўкі"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Задаць порт SMTP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Задаць порт POP3"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Задаць порт IMAP4"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Задаць порт NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Задаць даменнае імя"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Каталог сервера IMAP4."
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Толькі падкаталогі гэтага каталога будуць паказаны."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Ачышчаць усе кэшы паведамленняў пры выхадзе"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Змяшчаць дасланыя лісты ў"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Змяшчаць чарнавікі ў"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Змяшчаць чаргу ў"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Змяшчаць сцёртыя лісты ў"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Не ўведзена назва акаунта."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Не ўведзены адрас эл.пошты."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Не ўведзены сервер SMTP."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Не ўведзены ID карыстальніка."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Не ўказаны сервер POP3."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Не ўказаны сервер IMAP4."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Не ўказаны сервер NNTP."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Указаны каталог не з'яўляецца каталогам чаргі."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/bg.po b/po/bg.po
index bdee71f7..2741f55d 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: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+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"
@@ -31,205 +31,210 @@ msgstr "Папка"
 msgid "Junk mail filter"
 msgstr "Папка"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 връзката до %s се разпадна. Свързване...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP директория на сървъра"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 #, fuzzy
 msgid "Could not establish IMAP connection.\n"
 msgstr "Не може да се установи IMAP4 сесия с:  %s:%d\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "създаване на IMAP4 връзка до %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Не може да се стартира TLS сесия.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, fuzzy, c-format
 msgid "Getting message %u"
 msgstr "Изтриване на съобщение %d"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Получаване на съобщения от %s..."
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не могат да се установят изтрити флагове: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "не може да се заличи\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Получаване на съобщения от %s..."
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не могат да се установят изтрити флагове: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "не може да затвори папка\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "коренната папка %s не съществува\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "грешка при получаване на LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Не може да се създаде '%s'\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Не може да се създаде '%s' под Входящи\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Не може да се създаде пощенска кутия: LIST се провали\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "Не може да се създаде пощенска кутия\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "Не може да се създаде пощенска кутия\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Не може да се преименува пощенска кутия: %s до %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "Не може да се изтрие пощенска кутия\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "грешка при вземане на envelope.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "не може да се анализира envelope: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "не може да се вземе envelope\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не може да се установи връзка с IMAP4 сървър: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не може да се установи IMAP4 сесия с:  %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "не може да се получи пространството от имена\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не може да се избере папка: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "грешка при imap команда: CLOSE\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 удостоверяване провалено.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 влизане провалено.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не може да се прибави %s към %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(изпращане на файл...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "съобщението не може да се прибави към %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не може да се копира %s в %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "грешка при imap команда: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "грешка при imap команда: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "грешка при imap команда: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може да преобразува UTF-7 до %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може да преобразува %s до UTF-7\n"
@@ -498,7 +503,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "грешка при POP3 сесията\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "неуспешно записване на настройките във файл\n"
@@ -550,50 +555,50 @@ msgstr "грешен SMTP отговор\n"
 msgid "error occurred on SMTP session\n"
 msgstr "грешка при SMTP сесията\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "не е наличен SSLv23\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "наличен SSLv23\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "не е наличен TLSv1\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "наличен TLSv1\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "не е наличен SSL метода\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Непознат SSL метод *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Грешка при създаване на ssl контекст\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL връзка използвайки %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Сертификат на сървъра:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Субект: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Издател: %s\n"
@@ -651,7 +656,7 @@ msgstr ""
 "програмата; в случай, че не сте, обърнете се към Free Software Foundation, "
 "Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -690,14 +695,14 @@ msgstr ""
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Име"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -827,13 +832,13 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Адрес"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Забележки"
 
@@ -846,7 +851,7 @@ msgstr "Изберете папка от адресната книга"
 msgid "Auto-registered address"
 msgstr "Регистрирани правила"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Файл"
@@ -868,10 +873,10 @@ msgstr "/_Файл/Нов _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Файл/---"
@@ -888,21 +893,21 @@ msgstr "/_Файл/_Изтриване"
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
@@ -949,7 +954,7 @@ msgstr "/_Адрес/_Редактиране"
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Инструменти"
@@ -963,12 +968,12 @@ msgstr "/_Инструменти/Внасяне на _LDIF файл"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
@@ -986,7 +991,7 @@ msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1030,7 +1035,7 @@ msgstr "Адресна книга"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Папка"
 
@@ -1043,17 +1048,17 @@ msgstr "E-Mail адрес"
 msgid "Search:"
 msgstr "Търсене"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "До:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1268,7 +1273,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1324,448 +1329,453 @@ msgstr "Кафяв"
 msgid "None"
 msgstr "Никой"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Отваряне"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Добавяне"
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Премахване"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Аксесоари..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_файл/_Запазване"
 
-#: src/compose.c:581
+#: src/compose.c:586
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Съобщение/Изпращане _по-късно"
 
-#: src/compose.c:584
+#: src/compose.c:589
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Съобщение/_Запазване в папката с чернови"
 
-#: src/compose.c:586
+#: src/compose.c:591
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Съобщение/Запазване и _продължаване на редакция"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Файл/_Прикрепване на файл"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Файл/_Внасяне на файл"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Файл/Внасяне на _сигнатура"
 
-#: src/compose.c:593
+#: src/compose.c:598
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Файл/Внасяне на _сигнатура"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Редактиране/_Отмяна"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Редактиране/_Повтаряне"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Редактиране/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Редактиране/_Отрязване"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Редактиране/Вмъкване като _цитат"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Редактиране/_Избиране на всички"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Редактиране/_Пренасяне на текущия абзац"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Редактиране/П_ренасяне на всички дълги редове"
 
-#: src/compose.c:612
+#: src/compose.c:617
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Изглед"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Изглед/_До"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Изглед/_Сс"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Изглед/_Всс"
 
-#: src/compose.c:617
+#: src/compose.c:622
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Изглед/_Отговор до"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Изглед/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Изглед/_Допълнителен до"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Изглед/_Линия"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Изглед/_Притурка"
 
-#: src/compose.c:625
+#: src/compose.c:630
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Изглед/_Кодиране/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Изглед/_Кодиране/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Изглед/_Кодиране/Central European (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Изглед/_Кодиране/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Изглед/_Кодиране/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Изглед/_Кодиране/Korean (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Изглед/_Кодиране/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Изглед/_Кодиране/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Инструменти/_Адресна книга"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Инструменти/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Редактиране/Редактиране с _външен редактор"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:728
+#: src/compose.c:733
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:733
+#: src/compose.c:738
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Инструменти/_Изпълнение"
 
-#: src/compose.c:734
+#: src/compose.c:739
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Не може да се намери текстовата част\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Грешка в формата на цитат."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Грешка в reply/forward формата на съобщението."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Не може да се прочете %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Съобщение: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Сигнатура"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Притурки"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Автоматично установяване на следните адреси"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 #, fuzzy
 msgid "_Send"
 msgstr "Изпращане"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Проверяване за нови съобщения във всички папки..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1773,42 +1783,42 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1819,12 +1829,12 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1833,15 +1843,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1850,98 +1860,108 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Не може да се отвори файл %s\n"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Дата"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Сигнатура"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Проверяване на подписа"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: файлът не съществува\n"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1949,12 +1969,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1964,52 +1984,52 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -2051,7 +2071,7 @@ msgid "Nick Name"
 msgstr "Прякор"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-Mail адрес"
 
@@ -2110,7 +2130,7 @@ msgid " Check File "
 msgstr " Проверка на файл "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Файл"
 
@@ -2119,62 +2139,62 @@ msgstr "Файл"
 msgid "Add New Address Book"
 msgstr "Добавяне на нова Адресна Книга"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Име на Група трябва да бъде попълнено."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Редактиране на данни за Група"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Име на Група"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Налични адреси"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Адреси в групата"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Местене на E-Mail адреси до или от Група с бутоните със стрелки"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Редактиране на детайли за Група"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Добавяне на Нова Група"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Редактиране на папка"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папка:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Въведете име на нова папка:"
 
@@ -2191,7 +2211,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редактиране на JPilot запис"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2256,7 +2276,7 @@ msgstr "Пауза (сек)"
 msgid "Maximum Entries"
 msgstr "Максимум записи"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Основни"
 
@@ -2348,7 +2368,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr "Избор..."
 
@@ -2543,12 +2563,12 @@ msgstr "Установяване информация за папка...\n"
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
@@ -3392,734 +3412,744 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Файл/_Папка"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Файл/_Папка/Създаване на _нова папка"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Файл/_Папка/П_реименуване на папка..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Файл/_Папка/П_реименуване на папка..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Файл/_Папка/_Изтриване на папка"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Файл/_Добаване на пощенска кутия..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Файл/_Добаване на пощенска кутия..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/П_ремахване на пощенска кутия"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Файл/_Папка/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Проверка за нови съобщения"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Файл/_Папка/_Проверка за нови съобщения във всички папки"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Възобновяване дървото на папката"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 #, fuzzy
 msgid "/_File/_Import mail data..."
 msgstr "/_Файл/_Внасяне на mbox файл..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_File/_Export mail data..."
 msgstr "/_Файл/_Изнасяне на mbox файл..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Файл/Изпразване на _кошчето"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Файл/З_апазване в..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Файл/З_апазване в..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Файл/Пе_чат..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Файл/_Работа без мрежа"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Файл/Из_ход"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Редактиране/Избор по _тема"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Редактиране/_Търсене в текущото съобщение..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Редактиране/Търсене в _съобщенията..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 #, fuzzy
 msgid "/_Edit/_Quick search"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Изглед/Показване или _скриване"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Изглед/Показване или _скриване/_Дърво на папките"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Изглед/Показване или _скриване/_Изглед на съобщенията"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Изглед/Показване или _скриване/_Лента"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Изглед/Показване или _скриване/_Лента/Икони и _текст"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Икони"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Икони"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Изглед/Показване или _скриване/_Лента/Т_екст"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Без показване"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Изглед/Показване или _скриване/Лента на _състоянието"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Изглед/Показване или _скриване/Лента на _състоянието"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 #, fuzzy
 msgid "/_View/Layou_t"
 msgstr "/_Изглед/_Сортиране"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 #, fuzzy
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Изглед/_Сортиране/по _подател"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr ""
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Изглед/_Отделно дърво на папките"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Изглед/Отделен изглед на съобщенията"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Изглед/_Сортиране"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Изглед/_Сортиране/по _номер"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Изглед/_Сортиране/по _размер"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Изглед/_Сортиране/по _дата"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Изглед/_Сортиране/по _дата"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Изглед/_Сортиране/по _подател"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Изглед/_Сортиране/по п_олучател"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Изглед/_Сортиране/по _тема"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Изглед/_Сортиране/по _цвят"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Изглед/_Сортиране/по _отбелязване"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Изглед/_Сортиране/по _непрочетени"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Изглед/_Сортиране/по _притурка"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Изглед/_Сортиране/_Без сортиране"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Изглед/_Сортиране/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Изглед/_Сортиране/Възходящо"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Изглед/_Сортиране/_Привличане по тема"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Изглед/_Нишков изглед"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Изглед/_Развиване на всички нишки"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Изглед/_Свиване на всички нишки"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Изглед/Атрибути на извадката"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Изглед/П_реход до"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Изглед/П_реход до/_Предишно съобщение"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Изглед/П_реход до/_Следващо съобщение"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Изглед/П_реход до/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Изглед/П_реход до/П_редишно непрочетено съобщение"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Изглед/П_реход до/С_ледващо непрочетено съобщение"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Изглед/П_реход до/Предишно _ново съобщение"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Изглед/П_реход до/Следващо н_ово съобщение"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Изглед/П_реход до/Предишно _маркирано съобщение"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Изглед/П_реход до/Следващо м_аркирано съобщение"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Изглед/П_реход до/Предишно _оцветено съобщение"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Изглед/П_реход до/Следващо о_цветено съобщение"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Изглед/_Кодиране/_Автоматично разпознаване"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Изглед/_Кодиране/Japanese (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Изглед/_Кодиране/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Изглед/_Кодиране/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Изглед/Отваряне в _нов прозорец"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Изглед/_Изходен код"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Изглед/_Цялата заглавна част"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Изглед/_Обновяване на извадката"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Съобщение"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Съобщение/_Отказ на получаване"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Съобщение/_Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Съобщение/_Съставяне на ново съобщение"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Съобщение/_Отговор"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Съобщение/Отговор _до"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Съобщение/Отговор _до/_всички"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Съобщение/Отговор _до/_подател"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Съобщение/Отговор _до/_пощенски списък"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Съобщение/П_репращане"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Съобщение/Пр_епращане като притурка"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Съобщение/_Пренасочване"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Съобщение/_Преместване"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Съобщение/_Копиране"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Съобщение/_Маркиране"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 #, fuzzy
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Съобщение/_Маркиране/_Маркиране"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Съобщение/_Маркиране/_Размаркиране"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Съобщение/_Маркиране/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Съобщение/_Маркиране/като _непрочетено"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Съобщение/_Маркиране/като _прочетено"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Съобщение/_Маркиране/като _прочетено"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Съобщение/_Маркиране/_всички като прочетени"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Съобщение/_Изтриване"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Инструменти/_Добавяне на подател в адресната книга"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Инструменти/_Създаване на правило за филтриране"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/_Автоматично"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Подател"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по П_олучател"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Тема"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Инструменти/И_зтриване на повтарящи се съобщения"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 #, fuzzy
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Инструменти/И_зтриване на повтарящи се съобщения"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Изпълняване на маркирания процес"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Инструменти/_Филтриране на съобщенията"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Инструменти/_Филтриране на съобщенията"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Инструменти/_Журнален прозорец"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Конфигуриране"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Конфигуриране/_Общи предпочитания"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 #, fuzzy
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Конфигуриране/_Установяване на филтър"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Конфигуриране/_Шаблон"
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Конфигуриране/_Действия"
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 #, fuzzy
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Конфигуриране/_Шаблон"
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Конфигуриране/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Конфигуриране/_Предпочитания за текущия акаунт"
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Конфигуриране/_Създаване на нов акаунт"
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Конфигуриране/_Редактиране на акаунтите"
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Конфигуриране/С_мяна на текущия акаунт"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Помощ/_Наръчник"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Помощ/_Наръчник/_Английски"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Помощ/_Наръчник/_Японски"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Помощ/_Чести въпроси"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Помощ/_Чести въпроси/_Английски"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Помощ/_Чести въпроси/_Немски"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Помощ/_Чести въпроси/_Испански"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Помощ/_Чести въпроси/_Френски"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Помощ/_Чести въпроси/_Италиански"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Не е въведен команден ред."
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Помощ/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr ""
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr ""
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Създаване на главен прозорец...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Неозаглавен"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "липсва"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Без достъп до мрежа"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Работите без достъп до мрежа. Желаете ли да включите мрежата?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Изчистване на кошчето"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Добавяне на пощенска кутия"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -4130,16 +4160,16 @@ msgstr ""
 "Ако е указана съществуваща кутия, тя ще бъде\n"
 "сканирана автоматично."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4148,104 +4178,104 @@ msgstr ""
 "Създаването на пощенска кутия се провали.\n"
 "Вече съществуват някакви файлове, или нямате права за запис."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Изглед на папките"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Отговор"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Икони"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 #, fuzzy
 msgid "_Text"
 msgstr "Текст"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 #, fuzzy
 msgid "_None"
 msgstr "Никой"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Работите без достъп до мрежа. Щракнете иконата за да включите мрежата."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Работите с достъп до мрежа. Щракнете иконата за да изключите мрежата."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Изход"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Желаете ли изход от програмата?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Избор на папка"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 #, fuzzy
 msgid "Command line options"
 msgstr "Не е въведен команден ред."
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Употреба: %s [ОПЦИЯ]...\n"
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4264,7 +4294,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4283,15 +4313,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4539,246 +4569,246 @@ msgstr "Файл"
 msgid "Description: "
 msgstr "Описание"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Отваряне на прозорец с предпочитанията за акаунта...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Акаунт%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Предпочитания за нов акаунт"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Предпочитания за акаунт"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Създаване на прозорец с предпочитанията за акаунта...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Получаване"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Изпращане"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Съставяне"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Неприкосновеност"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Напреднал"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Име на акаунтът"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Установяване като подразбиращ се"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Лична информация"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Пълно име"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Пощенски адрес"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Организация"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Информация за сървъра"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Новини (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Без (локално)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Сървърът изисква удостоверяване"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Новинарски сървър"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Сървър за получаване"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "SMTP сървър (изпращане)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Потребителски ID"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Парола"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Сървърът изисква удостоверяване"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Изтриване съобщенията от сървъра когато се получат"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Премахване след"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "дни"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 дни: незабавно премахване)"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Изтегляне на всички съобщения от сървъра"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Ограничение на размера при получаване"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "КB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Филтриране на съобщенията при получаване"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Входяща кутия"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Нефилтрираните съобщения ще бъдат съхранявани в тази папка)"
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Метод на удостоверяване"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Само при ръчно получаване"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Филтриране на съобщенията при получаване"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Новини"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Максимален брой изтегляни статии\n"
 "(неограничено ако е въведена 0)"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Не е указан получател"
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Получаване всички' проверява за нови съобщения в този акаунт"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Заглавна част"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Добавяне на заглавна част Дата"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Генериране на Message-ID"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Добавяне на заглавна част от потребителя"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Редактиране... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Удостоверяване"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Удостоверяване (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4787,251 +4817,255 @@ msgstr ""
 "Ако оставите тези полета празни, ще бъдат използвани\n"
 "същите user ID и парола като за получаване."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Удостоверяване с POP3 преди изпращане"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Сигнатура"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Име:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Изход на команда"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Автоматично установяване на следните адреси"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Отговор-до"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Подписване по подразбиране"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Криптиране по подразбиране"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "не може да се получи списък с получатели."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Използване на ASCII-armored формат за криптиране"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Използване на подпис в чист текст"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Използване на подразбиращия се GnuPG ключ"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Избор на ключ по вашия email адрес"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Ръчен избор на ключ"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "ID на потребителя или ключа:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Не се използва SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Използване на SSL за POP3 връзка"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Използване на STARTTLS команда за старт на SSL сесия"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Използване на SSL за IMAP4 връзка"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Използване на SSL за NNTP връзка"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Изпращане (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Използване на SSL за SMTP връзка"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Използване на неблокиращ SSL"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Изключете ако имате проблеми с SSL връзка)"
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 #, fuzzy
 msgid "Hostname:"
 msgstr "Име на хост"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 #, fuzzy
 msgid "Port:"
 msgstr "Порт"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 #, fuzzy
 msgid "Use authentication"
 msgstr "Удостоверяване"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Име:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 #, fuzzy
 msgid "Password:"
 msgstr "Парола"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 #, fuzzy
 msgid "Use SOCKS proxy on sending"
 msgstr "Използване на външна програма за изпращане"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Определяне на SMTP порт"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Определяне на POP3 порт"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Определяне на IMAP4 порт"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Определяне на NNTP порт"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Определяне на име на домейн"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP директория на сървъра"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Изтегляне на всички съобщения от сървъра"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Поставяне на изпратени съобщения в"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Поставяне на черновите в"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Поставяне на изтрити съобщения в"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Поставяне на изтрити съобщения в"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Не е въведено име на акаунта."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Не е въведен пощенски адрес."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Не е въведен SMTP сървър."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Не е въведен потребителски ID."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Не е въведен POP3 сървър."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Не е въведен IMAP4 сървър."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Не е въведен NNTP сървър."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/cs.po b/po/cs.po
index cd7bb7d1..bbb5a1d6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2011-01-23 01:42+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -32,202 +32,207 @@ msgstr "Filtr nevyžádané pošty (ruční)"
 msgid "Junk mail filter"
 msgstr "Filtr nevyžádané pošty"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Spojení přes IMAP4 s %s bylo přerušeno. Obnovuje se spojení...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Server IMAP4 vypnul LOGIN.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "Nelze navázat spojení IMAP.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "vytváří se spojení přes IMAP4 s %s:%d...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Nelze spustit relaci TLS.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(získávají se PŘÍZNAKY...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "Přijímá se zpráva %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Připojování zprávy k %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Přesouvají se zprávy %s do %s..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopírují se zprávy %s do %s..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Odstraňují se zprávy %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nelze opatřit příznakem smazané: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Odstraňují se všechny zprávy v %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nelze opatřit příznakem smazané: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "nelze zavřít složku\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "kořenová složka %s neexistuje\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "Během příkazu LIST se vyskytla chyba.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nelze vytvořit \"%s\"\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nelze vytvořit \"%s\" v doručené poště\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit poštovní schránku: selhal příkaz LIST\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit poštovní schránku\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "nelze vytvořit poštovní schránku\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nelze přejmenovat poštovní schránku: %s na %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "nelze smazat poštovní schránku\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Přijímá se záhlaví zprávy (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "během načítání obálky se vyskytla chyba.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nelze analyzovat obálku: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "nelze načíst obálku\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nelze se spojit se serverem IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nelze navázat relaci IMAP4 s: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "nelze vyhledat obálku\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "chyba příkazu služby IMAP: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentizace IMAP4 selhala.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Neúspěšné přihlášení k IMAP4.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nelze připojit %s k %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(posílání souboru...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nelze připojit zprávu k %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nelze kopírovat %s do %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba příkazu služby IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba příkazu služby IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba příkazu služby IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemůže provést konverzi z UTF-7 na %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemůže provést konverzi z %s na UTF-7\n"
@@ -503,7 +508,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "v relaci POP3 se vyskytla chyba\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "selhání při zápisu nastavení do souboru\n"
@@ -555,50 +560,50 @@ msgstr "chybná odpověď od SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "v relaci SMTP se vyskytla chyba\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 je nedostupné\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 je dostupné\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 je nedostupná\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 je dostupná\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "metoda SSL je nedostupná\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Neznámá metoda SSL *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Chyba při vytváření ssl context\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Spojení SSL používá %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Certifikát serveru:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Předmět: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Vydavatel: %s\n"
@@ -657,7 +662,7 @@ msgstr ""
 "programem; pokud se tak nestalo, napište o ni Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -694,14 +699,14 @@ msgstr ""
 "kontrolován při volbě \"Přijmout vše\", zaškrtněte políčko ve sloupci \"G\"."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Jméno"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -829,13 +834,13 @@ msgstr "Argument uživatele pro akci"
 msgid "Add Address to Book"
 msgstr "Přidat adresu do adresáře"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Adresa"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Poznámky"
 
@@ -847,7 +852,7 @@ msgstr "Vybrat složku adresáře"
 msgid "Auto-registered address"
 msgstr "Automaticky registrované adresy"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Soubor"
@@ -868,10 +873,10 @@ msgstr "/_Soubor/Nový _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Soubor/Nový server _LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Soubor/---"
@@ -888,21 +893,21 @@ msgstr "/_Soubor/_Smazat"
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/V_ložit"
 
@@ -946,7 +951,7 @@ msgstr "/_Adresa/U_pravit"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -959,12 +964,12 @@ msgstr "/_Nástroje/Importovat soubor _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovat soubor _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
@@ -982,7 +987,7 @@ msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1024,7 +1029,7 @@ msgstr "Adresář"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Složka"
 
@@ -1036,17 +1041,17 @@ msgstr "E-mailová adresa"
 msgid "Search:"
 msgstr "Hledat:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Příjemce:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
@@ -1249,7 +1254,7 @@ msgstr "Obecné adresy"
 msgid "Personal address"
 msgstr "Osobní adresy"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1305,403 +1310,408 @@ msgstr "Hnědá"
 msgid "None"
 msgstr "Nespecifikováno"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Otevřít"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Přidat..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Odstranit"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Soubor/_Odeslat"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Soubor/Odesla_t později"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Soubor/Uložit do složky _konceptů"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Soubor/Uložit a pok_račovat v úpravě"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Soubor/_Přiložit soubor"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Soubor/_Vložit soubor"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Soubor/Vložit podpi_s"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Soubor/Připo_jit podpis"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy/_Zpět"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vyjmout"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Vložit jako _citaci"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vybr_at vše"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/Za_rovnat aktuální odstavec"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zar_ovnat všechny dlouhé řádky"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/A_utomatické zarovnávání"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/Z_obrazit"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/Z_obrazit/_Příjemce"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/Z_obrazit/K_opie"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/Z_obrazit/S_krytá kopie"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/Z_obrazit/Odpovědi z_aslat na"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/Z_obrazit/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/Z_obrazit/Odpovědi _vystavit na"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/Z_obrazit/Praví_tko"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/Z_obrazit/Přílo_ha"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Z_obrazit/Up_ravit nástrojovou lištu..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/Z_obrazit/Znaková _sada"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Z_obrazit/Znaková _sada/_Automaticky rozpoznat"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/Z_obrazit/Znaková _sada/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Z_obrazit/Znaková _sada/7bitový ASCII (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Z_obrazit/Znaková _sada/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Z_obrazit/Znaková _sada/Západoevropské jazyky (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Z_obrazit/Znaková _sada/Západoevropské jazyky (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Z_obrazit/Znaková _sada/Středoevropské jazyky (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Z_obrazit/Znaková _sada/_Pobaltské jazyky (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Z_obrazit/Znaková _sada/Pobaltské jazyky (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Z_obrazit/Znaková _sada/Pobaltské jazyky (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Z_obrazit/Znaková _sada/Řečtina (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Z_obrazit/Znaková _sada/Arabština (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Z_obrazit/Znaková _sada/Arabština (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Z_obrazit/Znaková _sada/Hebrejština (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Z_obrazit/Znaková _sada/Hebrejština (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Z_obrazit/Znaková _sada/Turečtina (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Z_obrazit/Znaková _sada/Japonština (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Z_obrazit/Znaková _sada/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Z_obrazit/Znaková _sada/Zjednodušená čínština (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Z_obrazit/Znaková _sada/Tradiční čínština (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Z_obrazit/Znaková _sada/Korejština (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Z_obrazit/Znaková _sada/Thajština (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Z_obrazit/Znaková _sada/Thajština (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/Ad_resář"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Nástroje/Upravit pomocí e_xterního editoru"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Nástroje/Vyžádat _oznámení o doručení"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/Podepsat P_GP"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Nástroje/Ši_frovat PGP"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Nástroje/Kontrolovat pravopi_s"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/_Nastavit jazyk pro kontrolu pravopisu"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: soubor neexistuje\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Nelze získat textovou část\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Chyba ve formátu uvozovek."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovědi/předání."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nelze zjistit velikost souboru %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Nelze načíst %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Nelze získat část ze zprávy s více částmi."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Bez předmětu)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Podpis"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Není uveden předmět"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto odeslat?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Příloha není obsažena"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Není obsažena příloha. Odeslat bez příloh?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Zkontrolovat příjemce"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Opravdu odeslat tuto zprávu na následující adresy?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "_Odeslat"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Zjišťují se nové zprávy ve všech složkách..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "nelze načíst seznam příjemců."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1709,40 +1719,40 @@ msgstr ""
 "Není zadán účet k odesílání e-mailů.\n"
 "Před odesláním prosím vyberte nějaký účet."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Při posílání zprávy na %s se vyskytla chyba."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nelze vyhledat žádný klíč asociovaný s aktuálně vybraným ID klíče \"%s\"."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "Zprávu nelze podepsat."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "Zprávu nelze šifrovat."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "Zprávu nelze šifrovat nebo podepsat."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "nelze změnit práva souboru\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1753,11 +1763,11 @@ msgstr ""
 "\n"
 "Přesto odeslat jako %s?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Chyba při konverzi kódu"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1770,15 +1780,15 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Maximální délka řádku"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Šifrování s příjemci skryté kopie"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1792,94 +1802,104 @@ msgstr ""
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "nelze odstranit starou zprávu\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "zařazování zprávy...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "nelze vyhledat složku pozdržených zpráv\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "zprávu nelze zařadit\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Soubor %s neexistuje."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nelze otevřít soubor %s."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Vytváří se okno psaní zprávy...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Podepsat PGP"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "Šifrovat PGP"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Datový typ"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Podpis"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Kontroluje se podpis"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "Typ MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "Soubor neexistuje."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Otevírá se spustitelný soubor"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1891,12 +1911,12 @@ msgstr ""
 "Pokud chcete soubor spustit, nejprve jej uložte a ujistěte se, že nejde o "
 "virus či nějaký nebezpečný program."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Chybný příkaz pro externí editor: \"%s\"\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1905,48 +1925,48 @@ msgstr ""
 "Externí editor stále pracuje.\n"
 "Vynutit přerušení procesu (číslo procesu: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "_Upravit nástrojovou lištu..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Vybrat soubory"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Uložit zprávu"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah zprávy se změnil. Uložit do složky konceptů?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Zavřít _bez uložení"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu \"%s\"?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "Na_hradit"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "V_ložit"
 
@@ -1987,7 +2007,7 @@ msgid "Nick Name"
 msgstr "Přezdívka"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-mailová adresa"
 
@@ -2045,7 +2065,7 @@ msgid " Check File "
 msgstr " Otestovat soubor "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Soubor"
 
@@ -2053,63 +2073,63 @@ msgstr "Soubor"
 msgid "Add New Address Book"
 msgstr "Přidat nový adresář"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Je nutné zadat název skupiny."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Upravit data o skupině"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Název skupiny"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Dostupné adresy"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Adresy ve skupině"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "E-mailové adresy lze přesunovat do a ze skupiny pomocí tlačítek se šipkami"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Upravit detaily o skupině"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Přidat novou skupinu"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Upravit složku"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Zadejte prosím nový název složky:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Zadejte prosím název nové složky:"
 
@@ -2126,7 +2146,7 @@ msgid "Edit JPilot Entry"
 msgstr "Upravit záznam JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2191,7 +2211,7 @@ msgstr "Časový limit (v sek.)"
 msgid "Maximum Entries"
 msgstr "Maximum položek"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Základní"
 
@@ -2277,7 +2297,7 @@ msgid "MH (number only)"
 msgstr "MH (pouze číslo)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Vybrat... "
 
@@ -2461,12 +2481,12 @@ msgstr "Nastavování informace o složce...\n"
 msgid "Setting folder info..."
 msgstr "Nastavování informace o složce..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledává se složka %s%c%s..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledává se složka %s..."
@@ -3294,684 +3314,694 @@ msgstr ""
 "Bylo nalezeno dřívější uživatelské nastavení.\n"
 "Chcete ho přenést?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Soubor/_Složka"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Soubor/_Složka/_Vytvořit novou složku..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Soubor/_Složka/_Přejmenovat složku..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Soubor/_Složka/Př_esunout složku..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Soubor/_Složka/_Smazat složku"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Soubor/_Poštovní schránka"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Soubor/_Poštovní schránka/Při_dat poštovní schránku..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Soubor/_Poštovní schránka/Odstranit _poštovní schránku"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Soubor/_Poštovní schránka/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Soubor/_Poštovní schránka/_Zkontrolovat nové zprávy"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/_Soubor/_Poštovní schránka/Z_kontrolovat nové zprávy ve všech schránkách"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Soubor/_Poštovní schránka/O_bnovit strom složek"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_Soubor/_Importovat poštovní zprávy..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_Soubor/E_xportovat poštovní zprávy..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Soubor/V_yprázdnit všechny koše"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Soubor/Uložit j_ako..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Soubor/_Vzhled stránky..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Soubor/_Tisk..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Soubor/Pracovat o_ffline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Soubor/U_končit"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/Úp_ravy/Vybrat _vlákno"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/_Hledat v aktuální zprávě..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/Ú_pravy/Hledat zpráv_y..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/Ú_pravy/_Rychlé hledání"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/Z_obrazit/Zobrazovat nebo s_krývat"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Z_obrazit/Zobrazovat nebo s_krývat/_Strom složek"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Z_obrazit/Zobrazovat nebo s_krývat/Zobra_zování zpráv"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Z_obrazit/Zobrazovat nebo s_krývat/_Nástrojová lišta"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Z_obrazit/Zobrazovat nebo s_krývat/_Nástrojová lišta/Ikony _a text"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr ""
 "/Z_obrazit/Zobrazovat nebo s_krývat/_Nástrojová lišta/Text naprav_o od ikon"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Z_obrazit/Zobrazovat nebo s_krývat/_Nástrojová lišta/_Ikony"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Z_obrazit/Zobrazovat nebo s_krývat/_Nástrojová lišta/_Text"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Z_obrazit/Zobrazovat nebo s_krývat/_Nástrojová lišta/_Nezobrazovat"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Z_obrazit/Zobrazovat nebo s_krývat/Lišta _hledání"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Z_obrazit/Zobrazovat nebo s_krývat/Stavová _lišta"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/Z_obrazit/_Upravit nástrojovou lištu..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/Z_obrazit/Rozvrž_ení"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/Z_obrazit/Rozvrž_ení/_Běžné"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/Z_obrazit/Rozvrž_ení/_Svislé"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/Z_obrazit/Samostatný s_trom složek"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/Z_obrazit/Sa_mostatné zobrazování zpráv"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/Z_obrazit/Tříd_it"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/Z_obrazit/Tříd_it/Podle čí_sla"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Z_obrazit/Tříd_it/Podle _velikosti"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/Z_obrazit/Tříd_it/Podle _data"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Z_obrazit/Tříd_it/Podle s_táří vlákna"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/Z_obrazit/Tříd_it/Podle _odesílatele"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Z_obrazit/Tříd_it/Podle pří_jemce"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/Z_obrazit/Tříd_it/Podle př_edmětu"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/Z_obrazit/Tříd_it/Podle _barevného štítku"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/Z_obrazit/Tříd_it/Podle o_značení"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/Z_obrazit/Tříd_it/Podle ne_přečtených"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Z_obrazit/Tříd_it/Podle příloh_y"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Z_obrazit/Tříd_it/_Netřídit"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/Z_obrazit/Tříd_it/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/Z_obrazit/Tříd_it/Vzestupně"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/Z_obrazit/Tříd_it/Sestupně"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Z_obrazit/Tříd_it/_Získat z předmětu"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/Z_obrazit/Zobrazovat _vlákna"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/Z_obrazit/Rozbalit vše_chna vlákna"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/Z_obrazit/S_balit všechna vlákna"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/Z_obrazit/Nastavit zobrazované po_ložky..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/Z_obrazit/_Přejít"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Z_obrazit/_Přejít/Př_edchozí zpráva"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/Z_obrazit/_Přejít/Ná_sledující zpráva"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/Z_obrazit/_Přejít/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Z_obrazit/_Přejít/Předchozí nepřečtená zp_ráva"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Z_obrazit/_Přejít/Následující nepřeč_tená zpráva"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Z_obrazit/_Přejít/_Předchozí nová zpráva"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Z_obrazit/_Přejít/Následující n_ová zpráva"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Z_obrazit/_Přejít/Před_chozí označená zpráva"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Z_obrazit/_Přejít/Následující oz_načená zpráva"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Z_obrazit/_Přejít/Předchozí _zpráva se štítkem"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Z_obrazit/_Přejít/Nás_ledující zpráva se štítkem"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Z_obrazit/_Přejít/Do _jiné složky..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Z_obrazit/_Znaková sada/_Automaticky rozpoznat"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Z_obrazit/_Znaková sada/Západoevropské jazyky (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Z_obrazit/_Znaková sada/Japonština (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Z_obrazit/_Znaková sada/Japonština (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Z_obrazit/_Znaková sada/Japonština (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Z_obrazit/_Znaková sada/Tradiční čínština (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Z_obrazit/_Znaková sada/Čínština (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejština (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/Z_obrazit/Otevřít v _novém okně"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/Z_obrazit/Zd_roj zprávy"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/Z_obrazit/Všechna zá_hlaví"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/Z_obrazit/_Aktualizovat souhrn"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Zpráva"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_Zpráva/Přijmo_ut"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Zpráva/Přijmo_ut/Přijmout _z aktuálního účtu"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Zpráva/Přijmo_ut/Přijmout z_e všech účtů"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Zpráva/Přijmo_ut/Zastavit pří_jem zpráv"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Zpráva/Přijmo_ut/Vzdálená sch_ránka..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Zpráva/Přijmo_ut/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Zpráva/Odeslat pozd_ržené zprávy"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Zpráva/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Zpráva/_Nová zpráva"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Zpráva/_Odpovědět"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Zpráva/Odpo_vědět komu"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Zpráva/Odpo_vědět komu/_Všem"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Zpráva/Odpo_vědět komu/_Odesílateli"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Zpráva/Odpo_vědět komu/_Elektronické konferenci"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Zpráva/Předat dá_l"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Zpráva/Předat dál _jako přílohu"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Zpráva/Přesměrov_at"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Zpráva/Pře_sunout..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Zpráva/_Kopírovat..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Zpráva/Označ_it"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Zpráva/Označ_it/_Opatřit příznakem"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Zpráva/Označ_it/_Zrušit příznak"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Zpráva/Označ_it/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Zpráva/Označ_it/Označit jako _nepřečtené"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Zpráva/Označ_it/Označit jako _přečtené"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Zpráva/Označ_it/Označit _vlákno jako přečtené"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Zpráva/Označ_it/Označit vš_e jako přečtené"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Zpráva/S_mazat"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Zpráva/Označi_t jako nevyžádanou poštu"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Zpráva/Označit jako _vyžádanou poštu"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Zpráva/Znov_u upravit"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Nástroje/Př_idat odesílatele do adresáře..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/Filtrovat všechny z_právy ve složce"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtrovat vybrané zprávy"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/_Vytvoření filtru"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/_Vytvoření filtru/_Automaticky"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/_Vytvoření filtru/Podle _odesílatele"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/_Vytvoření filtru/Podle pří_jemce"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/_Vytvoření filtru/Podle _předmětu"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Nástroje/Fi_ltrovat nevyžádanou poštu ve složce"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Nástroje/Filtrovat nevyžádano_u poštu mezi vybranými zprávami"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/_Smazat duplikované zprávy"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Nástroje/Sp_ojit rozdělené zprávy"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Nástroje/Spustit označený pro_ces"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Nástroje/Fi_ltrovat nevyžádanou poštu ve složce"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Nástroje/Filtrovat všechny z_právy ve složce"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/_Záznamový protokol"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/Nastav_ení"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_ení/_Společná nastavení..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/Nastav_ení/Nastavení _filtrů..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_ení/Ša_blona..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_ení/_Akce..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/Nastav_ení/Správce zásuvných _modulů..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/Nastav_ení/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_ení/Nas_tavení aktuálního účtu..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_ení/Založit _nový účet..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_ení/Ú_pravy účtů..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_ení/_Změnit aktuální účet"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/Nápo_věda/_Příručka"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_věda/_Příručka/_Anglicky"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_věda/_Příručka/_Japonsky"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_věda/Č_asto kladené otázky"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_věda/Č_asto kladené otázky/_Anglicky"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_věda/Č_asto kladené otázky/_Německy"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_věda/Č_asto kladené otázky/Š_panělsky"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_věda/Č_asto kladené otázky/_Francouzsky"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_věda/Č_asto kladené otázky/_Italsky"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/Nápo_věda/Přepínače pří_kazové řádky"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/Nápo_věda/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/Nápo_věda/Zkontrolovat akt_ualizace..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/Nápo_věda/Zkontrolovat aktualizace zásuvných _modulů..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Vytváří se hlavní okno...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Jste v režimu offline. Přejít do režimu online?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Vyprázdnit všechny koše"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Smazat všechny zprávy v koších?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Přidat poštovní schránku"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3981,16 +4011,16 @@ msgstr ""
 "V případě zadání již existující bude tato\n"
 "automaticky prohledána."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštovní schránka \"%s\" již existuje."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Poštovní schránka"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4000,95 +4030,95 @@ msgstr ""
 "Může to být tím, že část schránky již existuje, nebo nemáte dostatečná práva "
 "na zápis."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Strom složek"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Odpovědět _všem"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Odpovědět _odesílateli"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Odpovědět _elektronické konferenci"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Předat dál _jako přílohu"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Ikony _a text"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Text naprav_o od ikon"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "_Ikony"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_Text"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_Nezobrazovat"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Jste v režimu offline. Kliknutím na ikonu přejdete do režimu online."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Jste v režimu online. Kliknutím na ikonu přejdete do režimu offline."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Ukončit"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Opravdu ukončit Sylpheed?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "Vybrané zprávy nemohou být sloučeny."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Vyberte složku, kterou chcete otevřít"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Přepínače příkazové řádky"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Použití: sylpheed [VOLBY]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4121,7 +4151,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4154,15 +4184,15 @@ msgstr ""
 "vypíše tuto nápovědu a skončí\n"
 "vypíše informaci o verzi a skončí"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Volba pouze pro Windows:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport čísloportu"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "určí port pro vzdálené příkazy IPC"
 
@@ -4397,236 +4427,236 @@ msgstr "Soubor: "
 msgid "Description: "
 msgstr "Popis: "
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Otevírání okna s nastavením účtu...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Účet%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Nastavení nového účtu"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Nastavení účtu"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Vytváří se okno nastavení účtu...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Příjem"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Odeslat"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Napsat"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Soukromí"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Rozšířené"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Název tohoto účtu"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Nastavit jako výchozí"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Osobní informace"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "E-mailová adresa"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organizace"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Informace o serveru"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Žádný (místní)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizaci"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Server news"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Server pro příjem"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Server SMTP (odesílání)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Uživatelské jméno"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Heslo"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Používat bezpečnou autentizaci (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Odstraňovat zprávy na serveru po jejich přijmutí"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Odstraňovat po"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "dnech"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 dnů: odstraňovat ihned"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Přijímat všechny zprávy ze serveru (včetně již přijatých)"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Maximální velikost pro příjem"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtrovat zprávy při příjmu"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Výchozí doručená pošta"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Nefiltrované zprávy budou ukládány v této složce."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Metoda autentizace"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automaticky rozpoznat"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Při příjmu kontrolovat pouze složku doručené pošty"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrovat zprávy v doručené poště při příjmu"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Diskusní skupiny"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Maximální počet příspěvků ke stažení"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Neomezeně, pokud je zadána 0."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "Při volbě \"Přijmout vše\" zjišťovat, zda existují nové zprávy"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Záhlaví"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Přidávat do záhlaví pole s datem"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Generovat ID zprávy"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Přidávat uživatelsky definované záhlaví"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Upravit... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Autentizace"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentizace SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4634,241 +4664,245 @@ msgstr ""
 "Pokud necháte tyto položky prázdné, bude použito uživatelské jméno a heslo k "
 "příjmu zpráv."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizace s POP3 před odesláním"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Přímý vstup"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Jméno:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Výstup příkazu"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Umístit podpis před citaci (nedoporučuje se)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavovat následující adresy"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Kopie"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Skrytá kopie"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Odpovědi zaslat na"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "Vždy přidávat podpis PGP"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "Vždy šifrovat zprávu"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Šifrovat při odpovídání na šifrovanou zprávu"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "nelze načíst seznam příjemců."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Při šifrování používat formát ASCII-armored"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Používat čistý textový podpis"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Používat výchozí klíč GnuPG"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Vybírat klíč podle e-mailové adresy"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Zadat klíč ručně"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "ID uživatele nebo klíče:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Nepoužívat SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Používat SSL při spojení přes POP3"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Používat příkaz STARTTLS ke spuštění relace SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Používat SSL při spojení přes IMAP4"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Používat SSL při spojení přes NNTP"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Odesílání (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Používat SSL při spojení přes SMTP"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Používat neblokující SSL"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Zrušte tuto volbu v případě problémů se spojením SSL."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "Používat SOCKS proxy"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Hostitelský počítač:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Port:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Používat autentizaci"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Jméno:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Používat SOCKS proxy při odesílání"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Určit port SMTP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Určit port POP3"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Určit port IMAP4"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Určit port NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Určit název domény"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Adresář serveru IMAP"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Budou zobrazeny pouze podsložky tohoto adresáře."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Při ukončení mazat veškerou vyrovnávací paměť zpráv"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Ukládat odeslané zprávy do"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Ukládat koncepty do"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Ukládat pozdržené zprávy do"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Ukládat smazané zprávy do"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Nebyl zadán název účtu."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Nebyla zadána e-mailová adresa."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Nebyl zadán server SMTP."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Nebylo zadáno uživatelské jméno."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Nebyl zadán server POP3."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Nebyl zadán server IMAP4."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Nebyl zadán server NNTP."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Zvolená složka není složkou s pozdrženými zprávami."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/da.po b/po/da.po
index b7502f6e..d23e8681 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: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -29,207 +29,212 @@ msgstr "Mappe"
 msgid "Junk mail filter"
 msgstr "Mappe"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 forbindelse til %s blev afbrudt. Forbinder...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP server sti."
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 #, fuzzy
 msgid "Could not establish IMAP connection.\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Kan ikke starte TLS session.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, fuzzy, c-format
 msgid "Getting message %u"
 msgstr "Sletter meddelelse %d"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Flytter meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Modtager meddelelse fra %s..."
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan ikke sætte slettede flag: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "kan ikke slette\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Modtager meddelelse fra %s..."
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan ikke sætte slettet flag: 1:%d\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Markéret fil ikke fundet.\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "fejl ved modtagelse af LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "kan ikke oprette '%s'\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan ikke oprette '%s'\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan ikke oprette mailbox: LIST fejlet\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "kan ikke oprette mailbox\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "kan ikke oprette mailbox\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan ikke omdøbe mailbox: %s til %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "kan ikke slette mailbox\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "fejl ved modtagelse af kuvert.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan ikke læse kuvert: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "kan ikke modtage kovert\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "kan ikke modtage namespace\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 godkendelse fejlede.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fejlet.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan ikke tilføje %s til %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(sender fil...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "kan ikke tilføje meddelelse %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan ikke kopiere %s til %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fejl ved IMAP kommando: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fejl ved IMAP kommand: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv can ikke konvertere %s til UTF-7\n"
@@ -502,7 +507,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "fejl under POP3 session\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "kunne ikke gemme konfiguration til fil\n"
@@ -554,50 +559,50 @@ msgstr "forkert SMTP svar\n"
 msgid "error occurred on SMTP session\n"
 msgstr "fejl under SMTP session\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 ikke tilgænglig\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 tilgænglig\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 ikke tilgænglig\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 tilgænglig\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "SSL metode ikke tilgænglig\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Ukendt SSL metode *PROGRAM FEJL*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Fejl ved oprettelse af SSL kontext\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL forbindelse benytter %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Server certifikat:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Emne: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Afsender: %s\n"
@@ -655,7 +660,7 @@ msgstr ""
 "program.Hvis ikke, så skriv til Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -694,14 +699,14 @@ msgstr ""
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Navn"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -831,13 +836,13 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Adresse"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Kommentar"
 
@@ -850,7 +855,7 @@ msgstr "Vælg adressebog mappe"
 msgid "Auto-registered address"
 msgstr "Registrerede regler"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Filer"
@@ -872,10 +877,10 @@ msgstr "/_Filer/Ny _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Filer/---"
@@ -892,21 +897,21 @@ msgstr "/_Filer/_Slet"
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
@@ -953,7 +958,7 @@ msgstr "/_Adresse/_Redigér"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Funktioner"
@@ -967,12 +972,12 @@ msgstr "/_Funktioner/Importer _LDIF-Fil"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
@@ -990,7 +995,7 @@ msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1034,7 +1039,7 @@ msgstr "Adressebog"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Mappe"
 
@@ -1047,17 +1052,17 @@ msgstr "E-post adresse"
 msgid "Search:"
 msgstr "Søg"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Til:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1266,7 +1271,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Note"
 
@@ -1322,448 +1327,453 @@ msgstr "Brun"
 msgid "None"
 msgstr "Ingen"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Åbn"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Tilføj..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Fjern"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Egenskaber..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Filer/_Gem"
 
-#: src/compose.c:581
+#: src/compose.c:586
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Meddelelse/_Send senere"
 
-#: src/compose.c:584
+#: src/compose.c:589
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Meddelelse/Gem i _kladde mappe"
 
-#: src/compose.c:586
+#: src/compose.c:591
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Meddelelse/_Send senere"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Filer/_Vedhæft fil"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Filer/_Indsæt fil"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Filer/Tilføj _underskrift"
 
-#: src/compose.c:593
+#: src/compose.c:598
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Filer/Tilføj _underskrift"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Redigér/_Fortryd"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Redigér/_Gentag"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Redigér/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigér/_Klip"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigér/_Sæt ind som citat"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Redigér/Markér _alle"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Redigér/Formater a_ktuelt afsnit"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:612
+#: src/compose.c:617
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigér/K_opiere"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Vis"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Vis/_Til"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Vis/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Vis/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:622
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Vis/_Svar til"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Vis/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Vis/_Followup to"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Vis/_Linieal"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Vis/_Vedhæft"
 
-#: src/compose.c:625
+#: src/compose.c:630
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vis/_Tegnsæt/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vis/_Tegnsæt/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vis/_Tegnsæt/Central European (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vis/_Tegnsæt/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vis/_Tegnsæt/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vis/_Tegnsæt/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vis/_Tegnsæt/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Funktioner/_Adressebog"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Funktioner/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Redigér/Redigér med e_kstern editor"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:728
+#: src/compose.c:733
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:733
+#: src/compose.c:738
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Funktioner/_Udfør"
 
-#: src/compose.c:734
+#: src/compose.c:739
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Kan ikke læse tekst afsnit\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Citat markérings format fejl."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke læse %s"
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Underskrift"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 #, fuzzy
 msgid "Empty subject"
 msgstr "Emne"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Vedhæftet"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Udfyld automatisk følgende adresser"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Emne:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 #, fuzzy
 msgid "_Send"
 msgstr "Send"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Henter nye meddelelser i alle mapper..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1771,42 +1781,42 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, 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:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1817,12 +1827,12 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1831,15 +1841,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1848,98 +1858,108 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan ikke åbne filen %s\n"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Dato"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Underskrift"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Undersøger signatur"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME type"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: fil findes ikke\n"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1947,12 +1967,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1962,52 +1982,52 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -2049,7 +2069,7 @@ msgid "Nick Name"
 msgstr "Alias"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-post adresse"
 
@@ -2108,7 +2128,7 @@ msgid " Check File "
 msgstr " Check fil "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Fil"
 
@@ -2117,62 +2137,62 @@ msgstr "Fil"
 msgid "Add New Address Book"
 msgstr "Tilføj ny adressebog"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr " Et gruppe navn skal indtastes."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Redigér gruppendata"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Gruppe navn"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Mulige adresser"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Adresser i gruppe"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Flyt e-post adresse fra eller til gruppe med pil tasterne"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Redigér gruppendetaljer"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Tilføj gruppe"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Redigér mappe"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -2189,7 +2209,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigér JPilot indtastning"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2254,7 +2274,7 @@ msgstr "Timeout (sek)"
 msgid "Maximum Entries"
 msgstr "Max. indtastninger"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Enkelt"
 
@@ -2346,7 +2366,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Vælg... "
 
@@ -2541,12 +2561,12 @@ msgstr "Indtast mappe information...\n"
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
@@ -3393,735 +3413,745 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Filer/_Mappe"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Filer/_Mappe/Opret _ny mappe..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Filer/_Mappe/_Omdøb mappe..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Filer/_Mappe/_Omdøb mappe..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Filer/_Mappe/_Slet mappe"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Filer/_Tilføj mailbox..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Filer/_Tilføj mailbox..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Slet _mappe"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Filer/_Mappe/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "_Hent nye meddelelser"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Filer/_Mappe/_Hent nye meddelelser i alle mapper"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/G_endan mappe træ"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 #, fuzzy
 msgid "/_File/_Import mail data..."
 msgstr "/_Filer/_Importere mbox fil..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_File/_Export mail data..."
 msgstr "/_Filer/_Eksportere mbox fil..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Filer/_Tøm slettet post"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Filer/_Gem som..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Filer/_Gem som..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Filer/_Udskriv..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Filer/_Indsæt fil"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Filer/_Afslut"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Redigér/Markér _tråd"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redigér/_Søg i aktuel meddelelse"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Søg meddelelser..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 #, fuzzy
 msgid "/_Edit/_Quick search"
 msgstr "/_Redigér/Gennemsøg mappe"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Vis/_Vis eller skjul"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vis/_Vis eller skjul/_Mappe træ"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vis/_Vis eller skjul/_Besked"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/Ikon _og tekst"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ikon"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ikon"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Tekst"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ingen"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Vis/_Vis eller skjul/_Status linie"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vis/_Vis eller skjul/_Status linie"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 #, fuzzy
 msgid "/_View/Layou_t"
 msgstr "/_Vis/_Sortere"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 #, fuzzy
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Vis/_Sortere/_Fra orden"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr ""
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vis/_Seperat mappe træ"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vis/Seperat m_eddelelses vindue"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Vis/_Sortere"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vis/_Sortere/_Nummer orden"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vis/_Sortere/_Størrelses orden"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vis/_Sortere/_Dato orden"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Vis/_Sortere/_Dato orden"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vis/_Sortere/_Fra orden"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vis/_Sortere/Efter _modtager"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vis/_Sortere/_Emne orden"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vis/_Sortere/_Farvet label orden"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vis/_Sortere/_Markéret orden"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vis/_Sortere/_Ulæst orden"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vis/_Sortere/_Vedhæft orden"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vis/_Sortere/Sorter _ikke"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Vis/_Sortere/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Vis/_Sortere/Stigende"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vis/_Sortere/_Emne orden"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Vis/_Trådet"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "_Vis/Åbn tråde"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vis/_Saml alle tråde"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Vis/_Sæt visning ..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Vis/_Gå til"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vis/_Gå til/_Forrige meddelelse"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vis/_Gå til/_Næste meddelelse"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Vis/_Gå til/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Vis/_Gå til/Forrige ulæste meddelelse"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vis/_Gå til/Næste ulæste meddelelse"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vis/_Gå til/_Forrige nye meddelelse"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vis/_Gå til/_Næste nye meddelelse"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vis/_Gå til/Forrige _markéret meddelelse"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vis/_Gå til/Næste  _markéret meddelelse"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vis/_Gå til/Forrige _label meddelelse"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vis/_Gå til/Næste _label meddelelse"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vis/_Tegnsæt/_Automatisk"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vis/_TegnsætJapanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vis//_Tegnsæt/Japanese (_Shift_JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vis/_Tegnsæt/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Vis/Åbn i nyt vindue"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Vis/_Kilde"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Vis/Alle _hoveder"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Vis/_Opdatér oversigt"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Meddelelse"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Meddelelse/_Afbryd afsendelse"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelelse/Send meddelelser i _kø"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Meddelelse/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelelse/Opret _ny meddelelse"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Meddelelse/_Besvar"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelelse/_Svar til"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelelse/_Svar til/A_lle"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelelse/_Svar til/Af_sender"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelelse/_Svar til/_Alle"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Meddelelse/_Videresend"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelelse/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelelse/_Omdirigér"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelelse/_Flyt..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelelse/_Kopiere..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Meddelelse/_Markér"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 #, fuzzy
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Meddelelse/_Markér/_Markér"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Meddelelse/_Markér/_Slet markéring"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelelse/_Markér/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelelse/_Markér/Som ulæst"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelelse/_Markér/Som læst"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Meddelelse/_Markér/Som læst"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelelse/_Markér/Alle som læst"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Meddelelse/_Slet"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Funktioner/Tilføj afsender til adressebog"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Funktioner/_Opret filter"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Funktioner/_Opret filter/_Automatisk"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Funktioner/_Opret filter/Efter _Fra"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Funktioner/_Opret filter/Efter _Til"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Funktioner/_Opret filter/Efter _Emne"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Meddelelse/Slet alle du_blikerede meddelelser"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 #, fuzzy
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Meddelelse/Slet alle du_blikerede meddelelser"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Udfør markéret process"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Funktioner/_Filtrere meddelelse"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Funktioner/_Filtrere meddelelse"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/Funktioner/_Logbog vindue"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Opsæt"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Opsæt/Generelt _opsæt..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 #, fuzzy
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Opsæt/_Filter opsæt..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Opsæt/_Skabelon..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Opsæt/_Handlinger..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 #, fuzzy
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Opsæt/_Skabelon..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Opsæt/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Opsæt/_Den aktuelle konto..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Opsæt/_Opret ny konto..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Opsæt/_Redigér konti..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Opsæt/_Skift aktuel konto..."
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Hjælp/_Vejledning"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/_Vejledning/_Engelsk"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/_Vejledning/_Japansk"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Hjælp/_OSS"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjælp/_OSS/_Engelsk"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjælp/_OSS/_Tysk"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjælp/_OSS/_Spansk"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjælp/_OSS/_Fransk"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjælp/_OSS/_Italiensk"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Kommando linie ikke opsat."
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Hjælp/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr ""
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr ""
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Opretter hoved vindue...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "ingen"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tøm Slettet"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Ny mailbox"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -4132,16 +4162,16 @@ msgstr ""
 "Hvis den eksisterende mailbox angives, vil den blive\n"
 "gennemsøgt automatisk."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4150,104 +4180,104 @@ msgstr ""
 "Fejl i oprettelse af mailbox.\n"
 "Måske findes filerne allerede eller du har ikke skrive rettighedder."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappe visning"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Svar"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ikon"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 #, fuzzy
 msgid "_Text"
 msgstr "Tekst"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 #, fuzzy
 msgid "_None"
 msgstr "Ingen"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Vælg mappe"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommando linie ikke opsat."
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Bruges som: %s [OPTION]...\n"
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4266,7 +4296,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4285,15 +4315,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4541,243 +4571,243 @@ msgstr "Fil"
 msgid "Description: "
 msgstr "Beskrivelse"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Åbner konti egenskaber...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Opsæt af ny konto"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Konto opsæt"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Opretter konto egenskaber...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Modtag"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Send"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Opret"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Privat"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Navn på denne konto"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Standard konto"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Personlige informationener"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Fuldt navn"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "E-post adresse"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Server data"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Ingen (lokal)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Dennes server kræver godkendelse"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Nyheds server"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Server til modtagelse"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "SMTP server (afsendelse)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Bruger ID"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Adgangskode"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Dennes server kræver godkendelse"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Slet meddelelser fra server efter modtagelse"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Slet efter"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "dage"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dage: slet straks)"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Hent alle meddelelser fra server"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Modtagelses størrelse maks."
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "kB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtrere meddelelse ved modtagelse"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Standard indbakke"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Godkendelses metode"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrere meddelelse ved modtagelse"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Nyheder"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr "Max antal artikler ved hentning (0 angiver alle)"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Mangler modtager"
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Hent alle' henter post fra denne konto"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Hoved"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Tilføj dato linie"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Opret meddelelses ID"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Tilføj bruger defineret hoved"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Redigér... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Godkendelse"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP godkendelse (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4786,251 +4816,255 @@ msgstr ""
 "Hvis du lader disse være tomme, benyttes\n"
 "samme bruger ID og adgangskode som ved modtagelse."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Godkend med POP3 før afsendelse"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Underskrift"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Navn:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Kommando tekst"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Udfyld automatisk følgende adresser"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Svar til"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Signer altid meddelelse"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Krypter altid meddelelser"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Benyt ASCII format til kodning"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Benyt klar tekst underskrift"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Benyt standard GnuPg nøgle"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Vælg nøgle efter e-post adresse"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Angiv nøgle manuelt"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Bruger eller nøgle ID"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Benyt ikke SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Benyt SSL til POP3 forbindelse"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Benyt STARTTLS kommando til at starte SSL session"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Benyt SSL til IMAP4 forbindelse"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Benyt SSL til NNTP forbindelse"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Send (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Benyt SSL til SMTP forbindelse"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Benyt ublokerende SSL"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Slp dette fra hvis du har problemer med SSL forbindelser)"
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 #, fuzzy
 msgid "Hostname:"
 msgstr "Host navn"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 #, fuzzy
 msgid "Port:"
 msgstr "Port"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 #, fuzzy
 msgid "Use authentication"
 msgstr "Godkendelse"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Navn:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 #, fuzzy
 msgid "Password:"
 msgstr "Adgangskode"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 #, fuzzy
 msgid "Use SOCKS proxy on sending"
 msgstr "Benyt eksternt program for afsendelse"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Angiv SMTP port"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Angiv POP3 port"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Angiv IMAP4 port"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Angiv NNTP port"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Angiv domæne navn"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP server sti."
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Hent alle meddelelser fra server"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Gem sendte meddelelser i"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Gem kladde i"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Gem slettede meddelelser i"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Gem slettede meddelelser i"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Konto navn er ikke angivet."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "E-post adresse ikke angivet."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "SMTP server ikke angivet."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Bruger ID ikke angivet."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "POP3 server ikke angivet."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server ikke angivet"
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "NNTP server ikke angivet."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/de.po b/po/de.po
index 06db32dc..344cbcbe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2011-08-17 10:15+0100\n"
 "Last-Translator: Volker Ribbert <volker.nospam@netcologne.de>\n"
 "Language-Team: de\n"
@@ -30,202 +30,207 @@ msgstr "Spam-Filter (manuell)"
 msgid "Junk mail filter"
 msgstr "Spam-Filter"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde getrennt. Verbinde erneut...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4-Server verhindert LOGIN.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "Konnte keine IMAP-Verbindung herstellen.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Kann TLS-Sitzung nicht beginnen.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(FLAGS werden geladen...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "Nachricht %u wird geladen"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Hänge Nachricht an %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Verschiebe Nachrichten %s nach %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiere Nachrichten %s nach %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Entferne Nachrichten von %s..."
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kann gelöschte Flags nicht setzen: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "löschen nicht möglich\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Entferne alle Nachrichten in %s..."
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kann gelöschte Flags nicht setzen: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "kann Ordner nicht schließen\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "Wurzelverzeichnis %s existiert nicht\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "Fehler beim Empfang von LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kann '%s' nicht erstellen\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Kann '%s' in INBOX nicht erstellen\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kann Mailbox nicht erstellen: LIST fehlgeschlagen\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "kann Mailbox nicht erstellen\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "kann Mailbox nicht erstellen\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kann Mailbox nicht umbenennen: %s in %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "kann Mailbox nicht löschen\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Lade Nachrichtenkopfzeilen (%d / %d bytes)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "Fehler beim Empfang der Nachrichtenhülle.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kann Nachrichtenhülle nicht analysieren: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "kann Nachrichtenhülle nicht laden\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kann IMAP4-Sitzung mit %s:%d nicht aufbauen\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "kann Namensraum nicht bekommen\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kann Ordner %s nicht auswählen\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "Fehler beim IMAP-Befehl: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "Fehler bei IMAP4-Authentisierung.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Fehler beim IMAP4-Login.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kann %s nicht an %s anhängen\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(versende Datei...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kann Nachricht nicht anhängen an %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kann %s nicht nach %s kopieren\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fehler beim IMAP-Befehl: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fehler beim IMAP-Befehl: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "Fehler beim IMAP-Befehl: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kann %s nicht nach UTF-7  konvertieren\n"
@@ -501,7 +506,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "Fehler in einer POP3-Sitzung\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "kann Konfiguration nicht speichern\n"
@@ -554,50 +559,50 @@ msgstr "fehlerhafte SMTP-Antwort\n"
 msgid "error occurred on SMTP session\n"
 msgstr "Fehler während einer SMTP-Sitzung\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 nicht verfügbar\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 verfügbar\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 nicht verfügbar\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 verfügbar\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "SSL-Methode nicht verfügbar\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Unbekannte SSL-Methode *PROGRAMM FEHLER*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Fehler beim Erstellen des SSL-Kontextes\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL-Verbindung benutzt %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Server-Zertifikat:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Betreff: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Aussteller(in): %s\n"
@@ -657,7 +662,7 @@ 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_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -696,14 +701,14 @@ msgstr ""
 "einzuschalten."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Name"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -831,13 +836,13 @@ msgstr "Benutzer-Parameter der Aktion"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch übernehmen"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Adresse"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Kommentar"
 
@@ -849,7 +854,7 @@ msgstr "Adressbuchordner auswählen"
 msgid "Auto-registered address"
 msgstr "Automatischer Adresseintrag"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Datei"
@@ -870,10 +875,10 @@ msgstr "/_Datei/Neues _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datei/Neuer _LDAP-Server"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Datei/---"
@@ -890,21 +895,21 @@ msgstr "/_Datei/_Löschen"
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
@@ -948,7 +953,7 @@ msgstr "/_Adresse/_Bearbeiten"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/E_xtras"
@@ -961,12 +966,12 @@ msgstr "/_Extras/Importiere _LDIF-Datei"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Extras/Importiere _CSV-Datei"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Hilfe/I_nfo"
@@ -984,7 +989,7 @@ msgid "/New _Folder"
 msgstr "/Neuer Or_dner"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1026,7 +1031,7 @@ msgstr "Adressbuch"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Ordner"
 
@@ -1038,17 +1043,17 @@ msgstr "E-Mail Adresse"
 msgid "Search:"
 msgstr "Suchen:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "An:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1258,7 +1263,7 @@ msgstr "Allgemeine Adresse"
 msgid "Personal address"
 msgstr "Persönliche Adresse"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Anmerkung"
 
@@ -1314,403 +1319,408 @@ msgstr "Braun"
 msgid "None"
 msgstr "ohne"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Öffnen"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Hinzufügen..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Entfernen"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Datei/_Senden"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Datei/S_päter senden"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Datei/Im Ent_wurfsordner speichern"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Datei/Speichern und Bearbeitung _fortsetzen"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Datei/Datei _anhängen"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Datei/Datei _einfügen"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datei/Signatur _einfügen"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Datei/_Signatur anhängen"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Bearbeiten/_Zurück"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Bearbeiten/Als Zitat _einfügen"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/_Alles auswählen"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Bearbeiten/Aktuellen Absatz um_brechen"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Bearbeiten/Alle langen Zeilen _umbrechen"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Aut_omatisch umbrechen"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Ansicht"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Ansicht/_An"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Ansicht/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Ansicht/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/_Ansicht/A_ntwort an"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Ansicht/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/_Ansicht/_Wiedervorlage an"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Ansicht/_Lineal"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Ansicht/An_hang"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ansicht/_Symbolleiste anpassen..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Ansicht/_Zeichenkodierung"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Ansicht/_Zeichenkodierung/_Automatisch"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ansicht/_Zeichenkodierung/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/_Zeichenkodierung/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ansicht/_Zeichenkodierung/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/_Zeichenkodierung/West Europa (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/_Zeichenkodierung/West Europa (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/_Zeichenkodierung/Zentral Europa (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/_Zeichenkodierung/_Baltisch (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/_Zeichenkodierung/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ansicht/_Zeichenkodierung/Baltisch (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/_Zeichenkodierung/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ansicht/_Zeichenkodierung/Arabisch (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ansicht/_Zeichenkodierung/Arabisch (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ansicht/_Zeichenkodierung/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ansicht/_Zeichenkodierung/Hebräisch (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/_Zeichenkodierung/Türkisch (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/_Zeichenkodierung/Kyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/_Zeichenkodierung/Kyrillisch (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ansicht/_Zeichenkodierung/Kyrillisch (KOI8-_U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/_Zeichenkodierung/Kyrillisch (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/_Zeichenkodierung/Japanisch (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/_Zeichenkodierung/Vereinfachtes Chinesisch (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ansicht/_Zeichenkodierung/Vereinfachtes Chinesisch (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/_Zeichenkodierung/Traditionelles Chinesisch (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/_Zeichenkodierung/Koreanisch (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/_Zeichenkodierung/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/_Zeichenkodierung/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Extras/_Adressbuch"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Extras/_Schablone"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Extras/A_ktionen"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Extras/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Extras/Mit e_xternem Editor bearbeiten"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Extras/E_mpfangsbestätigung anfordern"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Extras/PGP _Unterschreiben"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Extras/PGP _Verschlüsseln"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Extras/_Rechtschreibprüfung"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Extras/_Sprache einstellen"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: Datei existiert nicht\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Kann Textabschnitt nicht lesen\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Formatfehler bei Zitatzeichen."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Dateigröße von %s nicht feststellbar\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Verfassen%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Signatur"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Kein Empfänger angegeben"
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Betreff ist leer"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem senden?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Anhang fehlt"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Es gibt keinen Anhang. Ohne versenden?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Empfänger werden überprüft"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Diese Mail wirklich an folgende Adressen absenden?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "_Senden"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Alle Ordner auf neue Nachrichten prüfen..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1718,39 +1728,39 @@ msgstr ""
 "Kein Konto zum Versenden von E-Mails angegeben.\n"
 "Bitte wählen sie vor dem Senden ein Mailkonto."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, 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:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "Kann die Nachricht nicht signieren."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "Kann die Nachricht nicht verschlüsseln."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "Kann Nachricht weder signieren noch verschlüsseln."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1761,11 +1771,11 @@ msgstr ""
 "\n"
 "Dennoch als %s senden?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Fehler beim Umsetzen der Kodierung"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1778,15 +1788,15 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Mit Bcc verschlüsseln"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1800,94 +1810,104 @@ msgstr ""
 "\n"
 " Dennoch versenden?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ordner nicht finden\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Datei %s existiert nicht."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Kann Datei %s nicht öffnen."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Erstelle Editor-Fenster...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Mit PGP unterschreiben"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "Mit PGP verschlüsseln"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Datentyp"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Signatur"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Digitale Unterschrift überprüfen"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Zeichenkodierung"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "Datei nicht vorhanden."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Ausführbare Datei öffnen"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1899,12 +1919,12 @@ msgstr ""
 "Um sie auszuführen, speichern Sie sie bitte andernorts und überprüfen sie "
 "auf Viren- oder sonstigen Schadbefall."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Befehlszeile für den externen Editor ist ungültig: '%s'\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1913,48 +1933,48 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess dennoch abbrechen (pid: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "_Symbolleiste anpassen..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Dateien wählen"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Datei wählen"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Nachricht speichern"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Als Entwurf speichern?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Möchten Sie die Vorlage '%s' übernehmen?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Vorlage übernehmen"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -1995,7 +2015,7 @@ msgid "Nick Name"
 msgstr "Benutzername"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-Mail Adresse"
 
@@ -2053,7 +2073,7 @@ msgid " Check File "
 msgstr " Datei überprüfen "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Datei"
 
@@ -2061,62 +2081,62 @@ msgstr "Datei"
 msgid "Add New Address Book"
 msgstr "Neues Adressbuch hinzufügen"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Ein Gruppenname muss angegeben werden."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Gruppendaten bearbeiten"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Gruppenname"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Vorhandene Adressen"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Adressen in Gruppe"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mail-Adressen mit den Pfeiltasten zu oder von einer Gruppe bewegen"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Gruppendetails bearbeiten"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Neue Gruppe hinzufügen"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Ordner bearbeiten"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Neuer Name des Ordners:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Neuer Ordner"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Name des neuen Ordners:"
 
@@ -2133,7 +2153,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot-Eintrag bearbeiten"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2198,7 +2218,7 @@ msgstr "Timeout (Sek.)"
 msgid "Maximum Entries"
 msgstr "Einträge (Max.)"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Basis"
 
@@ -2284,7 +2304,7 @@ msgid "MH (number only)"
 msgstr "MH (nur Anzahl)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Auswählen... "
 
@@ -2468,12 +2488,12 @@ msgstr "Erstelle Ordnerinformation...\n"
 msgid "Setting folder info..."
 msgstr "Erstelle Ordnerinformation..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ordner %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ordner %s ..."
@@ -3306,683 +3326,693 @@ msgstr ""
 "Die Konfiguration einer Vorversion wurde gefunden.\n"
 "Soll sie umgestellt werden?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Datei/_Ordner"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datei/_Ordner/_Neuen Ordner erstellen..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datei/_Ordner/Ordner _umbenennen..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datei/_Ordner/Ordner _verschieben..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datei/_Ordner/Ordner _löschen"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Datei/_Mailbox"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datei/_Mailbox/Mailbox _hinzufügen..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Datei/_Mailbox/Mailbox _entfernen"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datei/_Mailbox/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Datei/_Mailbox/Auf _neue Nachrichten prüfen"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Datei/_Mailbox/_Alle Ordner auf neue Nachrichten prüfen"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Datei/_Mailbox/Ordnerbaum n_eubilden"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_Datei/Maildaten i_mportieren ..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_Datei/Maildaten _exportieren..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Datei/Alle _Papierkörbe leeren"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Datei/_Speichern als..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Datei/Seite_neinrichtung..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Datei/_Drucken..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Datei/Offline _arbeiten"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Datei/_Beenden"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Bearbeiten/_Thread auswählen"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Bearbeiten/Aktuelle Nachricht _durchsuchen..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Bearbeiten/_Nachrichten suchen..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/_Bearbeiten/_Schnellsuche"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Ansicht/Anzeigen oder _Verbergen"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ansicht/Anzeigen oder _Verbergen/_Ordnerbaum"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ansicht/Anzeigen oder _Verbergen/_Nachrichtenansicht"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ansicht/Anzeigen oder _Verbergen/_Symbolleiste"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ansicht/Anzeigen oder _Verbergen/_Symbolleiste/Bilder _und Text"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr ""
 "/_Ansicht/Anzeigen oder _Verbergen/_Symbolleiste/_Text rechts vom Symbol"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ansicht/Anzeigen oder _Verbergen/_Symbolleiste/_Bilder"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ansicht/Anzeigen oder _Verbergen/_Symbolleiste/_Text"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ansicht/Anzeigen oder _Verbergen/_Symbolleiste/_Nichts"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Ansicht/Anzeigen oder _Verbergen/S_uchleiste"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ansicht/Anzeigen oder _Verbergen/Status_zeile"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Ansicht/_Symbolleiste anpassen..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/_Ansicht/_Bildschirmaufteilung"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Ansicht/_Bildschirmaufteilung/_Normal"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/_Ansicht/_Bildschirmaufteilung/_Vertikal"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ansicht/Ausblenden des _Ordnerbaums"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Ansicht/Ausblenden der _Nachrichtenansicht"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Ansicht/_Sortieren"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ansicht/_Sortieren/nach _Nummer"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ansicht/_Sortieren/nach _Größe"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ansicht/_Sortieren/nach _Datum"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Ansicht/_Sortieren/nach _Threaddatum"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ansicht/_Sortieren/nach _Absender"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ansicht/_Sortieren/nach _Sender"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ansicht/_Sortieren/nach _Betreff"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ansicht/_Sortieren/nach _Farbmarke"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ansicht/_Sortieren/nach _Markierung"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ansicht/_Sortieren/nach _Ungelesen"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ansicht/_Sortieren/nach An_hang"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ansicht/_Sortieren/Nicht S_ortieren"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Ansicht/_Sortieren/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ansicht/_Sortieren/Aufsteigend"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ansicht/_Sortieren/Absteigend"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ansicht/_Sortieren/Threads nach Betreff _aufbauen"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Ansicht/_Threads aktivieren"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ansicht/Alle Threads ausklappen"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ansicht/Alle Threads einklappen"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Ansicht/Anzuzeigende _Elemente..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Ansicht/_Gehe zu"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ansicht/_Gehe zu/_Voriger Nachricht"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ansicht/_Gehe zu/_Nächster Nachricht"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Ansicht/_Gehe zu/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ansicht/_Gehe zu/V_origer ungelesener Nachricht"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ansicht/_Gehe zu/N_ächster ungelesener Nachricht"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ansicht/_Gehe zu/Voriger ne_uer Nachricht"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ansicht/_Gehe zu/Nächster _neuer Nachricht"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ansicht/_Gehe zu/Voriger _markierter Nachricht"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ansicht/_Gehe zu/Nächster m_arkierter Nachricht"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ansicht/_Gehe zu/Voriger marki_erter Nachricht"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ansicht/_Gehe zu/Nächster markier_ter Nachricht"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ansicht/_Gehe zu/Anderem Or_dner..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ansicht/_Zeichenkodierung/_Automatische Erkennung"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ansicht/_Zeichenkodierung/West Europa (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ansicht/_Zeichenkodierung/Japanisch (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ansicht/_Zeichenkodierung/Japanisch (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ansicht/_Zeichenkodierung/Japanisch (_Shift_JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/_Zeichenkodierung/Traditionelles Chinesisch (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ansicht/_Zeichenkodierung/Chinesisch (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ansicht/_Zeichenkodierung/Koreanisch (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/In neuem _Fenster öffnen"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Ansicht/_Quelltext der Nachricht"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/_Ansicht/_Alle Kopfzeilen anzeigen"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Ansicht/Ordnerinhalt akt_ualisieren"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Nachricht"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_Nachricht/_Empfangen"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Nachricht/_Empfangen/_Von aktuellem Mailkonto"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Nachricht/_Empfangen/Von _allen Mailkonten"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Nachricht/_Empfangen/_Empfang abbrechen"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Nachricht/_Empfangen/_Server-Postfach..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Nachricht/_Empfangen/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Nachricht/Sende _wartende Nachrichten"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Nachricht/_Neue Nachricht verfassen"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Nachricht/_Antworten"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Nachricht/Ant_wort an"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Nachricht/Ant_wort an/_Alle"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Nachricht/Ant_wort an/Ab_sender"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Nachricht/Ant_wort an/Mailing-_Liste"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Nachricht/W_eiterleiten"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Nachricht/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Nachricht/_Umleiten"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Nachricht/_Verschieben..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Nachricht/_Kopieren..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Nachricht/_Markieren"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Nachricht/_Markieren/_Markieren"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Nachricht/_Markieren/Markierung _entfernen"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Nachricht/_Markieren/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Nachricht/_Markieren/Als _ungelesen"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Nachricht/_Markieren/Al_s gelesen"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Nachricht/_Markieren/_Thread als gelesen"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Nachricht/_Markieren/_Alle als gelesen"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Nachricht/_Löschen"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Nachricht/Als _Spam markieren"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Nachricht/Als Ni_cht-Spam markieren"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Nachricht/Neu_bearbeiten"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Extras/A_bsender in Adressbuch einfügen"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Extras/Alle Nachrichten eines _Ordners filtern"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Extras/Ausgewählte _Nachrichten filtern"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Extras/Filter _erstellen"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Extras/Filter _erstellen/_Automatisch"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Extras/Filter _erstellen/nach _Von"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Extras/Filter _erstellen/nach A_n"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Extras/Filter _erstellen/nach _Betreff"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Extras/_Nachrichten eines Ordners nach Spam filtern"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Extras/Ausgewählte Nachrichten nach _Spam filtern"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Extras/_Lösche mehrfach vorhandene Nachrichten"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Extras/_Separierte Nachrichten verbinden"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Extras/Markierten _Prozess ausführen"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Extras/_Nachrichten eines Ordners nach Spam filtern"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Extras/Alle Nachrichten eines _Ordners filtern"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Extras/Protokoll-_Fenster"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Einstellungen"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Einstellungen/_Allgemeine Einstellungen..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Einstellungen/_Filtereinstellungen..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Einstellungen/_Vorlage..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Einstellungen/A_ktionen..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Einstellungen/_PlugIn-Manager..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Einstellungen/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Einstellungen/_Einstellungen für aktuelles Mailkonto..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Einstellungen/_Neues Mailkonto erstellen..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Einstellungen/_Mailkonten bearbeiten..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Einstellungen/Aktuelles Mailkonto _wechseln..."
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Hilfe/_Anleitung"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/Anleitung/_Englisch"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/Anleitung/_Japanisch"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Hilfe/_FAQ"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hilfe/_FAQ/_Englisch"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hilfe/_FAQ/_Deutsch"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hilfe/_FAQ/_Spanisch"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hilfe/_FAQ/_Französisch"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hilfe/_FAQ/_Italienisch"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Hilfe/_Befehlszeilen-Optionen"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Hilfe/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/_Hilfe/_Suche nach Updates..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/_Hilfe/Suche nach _PlugIn-Updates..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Erstelle Hauptfenster...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Farbzuweisung %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "fertig.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "keine"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Sie sind nicht im Netz. Verbinden?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Alle Papierkörbe leeren "
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Alle Nachrichten in Papierkörben löschen?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Mailbox hinzufügen"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3991,16 +4021,16 @@ msgstr ""
 "Geben Sie bitte den Ort der Mailbox an. Ist eine existierende\n"
 "Mailbox angegeben, wird sie automatisch durchsucht."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox '%s' existiert bereits."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4010,95 +4040,95 @@ msgstr ""
 "Vielleicht gibt es einige Dateien bereits, oder Sie sind nicht "
 "schreibberechtigt."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ordneransicht"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/An_twort"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Antwort an alle"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Ant_wort an Ab_sender"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/_Umleiten"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Grafik _und Text"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Text rechts vom Symbol"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "_Grafik"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_Text"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_Keine"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Sie sind offline. Klicken Sie zum Verbinden auf das Symbol."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Sie sind online. Klicken Sie zum Beenden auf das Symbol."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Dieses Programm beenden?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "Ausgewählte Nachrichten sind nicht kombinierbar."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Ordner zum Öffnen auswählen"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Optionen der Befehlszeile"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Anwendung: sylpheed [OPTION]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4131,7 +4161,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4164,15 +4194,15 @@ msgstr ""
 "diese Hilfe anzeigen und beenden\n"
 "Versionsinformationen anzeigen und beenden"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Windows-exklusive Option:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "den Port für \"IPC remote\"-Befehle festlegen"
 
@@ -4407,237 +4437,237 @@ msgstr "Datei: "
 msgid "Description: "
 msgstr "Beschreibung: "
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Fenster für Einstellungen des Mailkontos öffnen...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Mailkonto%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Einstellungen für neues Mailkonto"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Mailkonto-Einstellungen"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Erstelle Fenster für die Einstellungen des Mailkontos...\n"
 
 # AllgEinst
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Empfangen"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Senden"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Verfassen"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Privat"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Name des Mailkontos"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Standard-Mailkonto"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Persönliche Daten"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "E-Mail-Adresse"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Serverdaten"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Keines (lokal)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Dieser Server erfordert Authentisierung"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Newsserver"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Server zum Empfangen"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "SMTP-Server (senden)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Benutzerkennung (ID)"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Kennwort"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Verwende sichere Authentisierung (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Nachrichten nach Empfang vom Server löschen"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Löschen nach"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "Tag(en)"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 Tage: sofort entfernen"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Abruf aller Nachrichten (inkl. bereits empfangener) auf dem Server"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Größenbegrenzung bei Empfang"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Nachrichten bei Empfang filtern"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Standard-Posteingang"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "In diesem Ordner werden ungefilterte Nachrichten gespeichert."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Authentisierungsart"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Prüfe INBOX nur beim Empfang"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Neue Nachrichten beim Empfang in der INBOX filtern"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Maximale Anzahl herunterzuladender Artikel"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Ohne Begrenzung, wenn 0 angegeben"
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Alle abrufen' prüft, ob es neue Nachrichten für dieses Konto gibt."
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Kopfzeilen"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Datumsfeld einfügen"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Nachrichten-ID erzeugen"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Nutzerdefinierte Kopfzeile einfügen"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Bearbeiten... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Authentisierung"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Authentisierung (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4645,241 +4675,245 @@ msgstr ""
 "Wenn diese Einträge frei bleiben, werden Benutzer-ID und Kennwort wie zum "
 "Empfang verwendet."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Authentisiere mit POP3 vor dem Senden"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Direkteingabe"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Name:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Ausgabe des Steuerzeichens"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Signatur vor das Zitat setzen (nicht empfohlen)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Setze folgende Adressen automatisch"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "Nachricht immer mit PGP signieren"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "Nachricht immer mit PGP verschlüsseln"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Verschlüsseln beim Antworten auf verschlüsselte Nachricht"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Mit ASCII-Hüllen-Format verschlüsseln"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Klartextsignatur verwenden"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Standard-GnuPG-Schlüssel verwenden"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Schlüssel nach Mail-Adresse wählen"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Schlüssel manuell angeben"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Benutzer- oder Schlüssel-ID"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "SSL nicht benutzen"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "SSL für POP3-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Für SSL-Sitzung STARTTLS-Befehl benutzen"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL für IMAP4-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "SSL für NNTP-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "SSL für SMTP-Verbindung benutzen"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Nicht-blockierendes SSL verwenden"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Diese Option bei SSL-Verbindungsproblemen nicht aktivieren."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "SOCKS-Proxy verwenden"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Hostname:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Port:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Authentisierung verwenden"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Name:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Kennwort:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Beim Senden SOCKS-Proxy verwenden"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "SMTP-Port angeben"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "POP3-Port angeben"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "IMAP4-Port angeben"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "NNTP-Port angeben"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Domänenname:"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP-Serververzeichnis."
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Nur die Unterordner dieses Verzeichnisses werden angezeigt."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Alle Nachrichtenzwischenspeicher beim Beenden leeren"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Gesendete Nachrichten speichern in"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Entwürfe speichern in"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Wartende Nachrichten speichern in"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Gelöschte Nachrichten speichern in"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Kein Name für Mailkonto angegeben."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Keine E-Mail-Adresse angegeben."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Keinen SMTP-Server angegeben."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Keine Benutzer-ID angegeben."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Keinen POP3-Server angegeben."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Keinen IMAP4-Server angegeben."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Keinen NNTP-Server angegeben."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Bezeichneter Ordner dient nicht als Warteschlange."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/el.po b/po/el.po
index b7ad906d..5d6933f5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0beta5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2007-03-17 00:57+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -30,208 +30,213 @@ msgstr "Φίλτρο ανεπιθύμητης αλληλογραφίας (χει
 msgid "Junk mail filter"
 msgstr "Φίλτρο ανεπιθύμητης αλληλογραφίας"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Η IMAP4 σύνδεση στο %s διακόπηκε. Επανασύνδεση...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Ο διακομιστής IMAP4 απενεργοποίησε το LOGIN.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 #, fuzzy
 msgid "Could not establish IMAP connection.\n"
 msgstr "Δεν είναι δυνατή η σύνδεση στον διακομιστή IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "Δημιουργία σύνδεσης IMAP4 στο %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Δεν είναι δυνατό να ξεκινήσει συνεδρία TLS.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, fuzzy, c-format
 msgid "Getting message %u"
 msgstr "Λήψη μηνύματος %d"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Μετακίνηση μηνυμάτων στο %s"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Μετακίνηση μηνυμάτων %s στο %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Αντιγραφή μηνυμάτων %s στο %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Διαγραφή μηνυμάτων %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "Αποτυχία ορίσματος του PAM_TTY=%s"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "δεν μπορώ να τα απαλείψω\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Διαγραφή όλων των μηνυμάτων στο %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "Αποτυχία ορίσματος του PAM_TTY=%s"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "δεν είναι δυνατό το κλείσιμο του φακέλου\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "Ο ριζικός φάκελος %s δεν υπάρχει.\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "προέκυψε σφάλμα κατά τη λήψη της λίστας.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Δεν είναι δυνατή η δημιουργία του '%s'\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Δεν είναι δυνατή η δημιουργία του '%s' μέσα στο INBOX\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 "δεν είναι δυνατή η δημιουργία γραμματοκιβωτίου: η εντολή LIST απέτυχε\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "δεν είναι δυνατή η δημιουργία γραμματοκιβωτίου\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "δεν είναι δυνατή η δημιουργία γραμματοκιβωτίου\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Δεν είναι δυνατή η μετονομασία του γραμματοκιβωτίου: %s σε %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "δεν μπορώ να διαγράψω το mailbox\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Εμφάνιση Όλων των _Κεφαλίδων"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "δημιουργήθηκε σφάλμα κατά τη λήψη του φακέλου.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "δεν είναι δυνατή η ανάλυση του φακέλου: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "δεν είναι δυνατή η λήψη του φακέλου\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Δεν είναι δυνατή η σύνδεση στον διακομιστή IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Δεν είναι δυνατή η σύνδεση στον διακομιστή IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 #, fuzzy
 msgid "can't get namespace\n"
 msgstr "Αδυναμία λήψης όνοματος χρήστη"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "σφάλμα στην εντολή imap: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "Η πιστοποίηση στον IMAP4 απέτυχε.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Η είσοδος στον IMAP4 απέτυχε.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "δεν είναι δυνατή η προσάρτηση του %s στο %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(αποστολή αρχείου...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "Δεν είναι δυνατή η προσθήκη μηνύματος στον φάκελο `%s': %s"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "δεν είναι δυνατή η αντιγραφή του %s στο %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Error while spawning the mbadblocks command: %s."
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 #, fuzzy
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Error while spawning the mbadblocks command: %s."
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "Error while spawning the mbadblocks command: %s."
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "Δεν είναι δυνατή η μετατροπή του UTF-7 σε %s από το iconv\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "Δεν είναι δυνατή η μετατροπή του %s σε UTF-7 από το iconv\n"
@@ -506,7 +511,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "Προέκυψε σφάλμα στη συνεδρία POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "Η εγγραφή στο αρχείο ρυθμίσεων απέτυχε\n"
@@ -562,51 +567,51 @@ msgstr "εσφαλμένη απάντηση SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "προέκυψε σφάλμα στη σύνοδο SMTP\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "Το SSLv23 δεν είναι διαθέσιμο\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "Το SSLv23 είναι διαθέσιμο\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "Το TLSv1 δεν είναι διαθέσιμο\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "Το TLSv1 είναι διαθέσιμο\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "Η μέθοδος SSL δεν είναι διαθέσιμη\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Άγνωστη μέθοδος SSL *ΣΦΑΛΜΑ ΣΤΟ ΠΡΟΓΡΑΜΜΑ*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 #, fuzzy
 msgid "Error creating ssl context\n"
 msgstr "Σφάλμα δημιουργίας signal pipe."
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Σύνδεση SSL με χρήση %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Πιστοποιητικό διακομιστή:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Θέμα: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Εκδότης: %s\n"
@@ -666,7 +671,7 @@ msgstr ""
 "(Free Software Foundation) στη διεύθυνση Free Software Foundation, Inc., 59 "
 "Temple Place - Suite 330, Boston, MA 02110-1301, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -707,14 +712,14 @@ msgstr ""
 "όλων'."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Όνομα"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
@@ -843,13 +848,13 @@ msgstr "Παράμετρος ενέργειας χρήστη"
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο ευρετήριο"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Διεύθυνση"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Σχόλια"
 
@@ -862,7 +867,7 @@ msgstr "Επιλογή φακέλου από το Ευρετήριο διευθ�
 msgid "Auto-registered address"
 msgstr "Αποθηκευμένα πρότυπα"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Αρχείο"
@@ -883,10 +888,10 @@ msgstr "/_Αρχείο/Νέο _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Αρχείο/---"
@@ -903,21 +908,21 @@ msgstr "/_Αρχείο/_Διαγραφή"
 msgid "/_File/_Save"
 msgstr "/_Αρχείο/_Αποθήκευση"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Αρχείο/_Κλείσιμο"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Επεξεργασία"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Επεξεργασία/_Αντιγραφή"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Επεξεργασία/Ε_πικόλληση"
 
@@ -964,7 +969,7 @@ msgstr "/_Διεύθυνση/_Επεξεργασία"
 msgid "/_Address/_Delete"
 msgstr "/_Διεύθυνση/_Διαγραφή"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Εργαλεία"
@@ -978,12 +983,12 @@ msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Βοήθεια"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Βοήθεια/_Σχετικά"
@@ -1001,7 +1006,7 @@ msgid "/New _Folder"
 msgstr "/Νέος _φάκελος"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1043,7 +1048,7 @@ msgstr "Κατάλογος διευθύνσεων"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Φάκελος"
 
@@ -1055,17 +1060,17 @@ msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 msgid "Search:"
 msgstr "Αναζήτηση:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Προς:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Κρυφή κοινοποίηση:"
@@ -1285,7 +1290,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1342,408 +1347,413 @@ msgstr "Καφέ"
 msgid "None"
 msgstr "Κανένα"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Άνοιγμα"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Προσθήκη..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Διαγραφή"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Ιδιότητες..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Αρχείο/Απο_στολή"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Αρχείο/Αποστο_λή αργότερα"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Αρχείο/Αποθήκευση στον φάκελο _πρόχειρα"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Αρχείο/Αποθήκευση και _συνέχεια επεξεργασίας"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Αρχείο/Επισύνα_ψη αρχείου"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Αρχείο/Ε_ισαγωγή αρχείου"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Αρχείο/Εισαγωγή υπο_γραφής"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Αρχείο/Επισύναψη υπογ_ραφής"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Επεξεργασία/Α_ναίρεση"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Επεξεργασία/Επανά_ληψη"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Επεξεργασία/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Επεξεργασία/Απο_κοπή"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Επεξεργασία/Eπικόλληση ως πα_ράθεση"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Επεξεργασία/Επιλ_ογή όλων"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Επεξεργασία/Ανα_δίπλωση τρέχουσας παραγράφου"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Επεξεργασία/Αναδίπλωση μακρών _γραμμών"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Επεξεργασία/Αυτό_ματη αναδίπλωση"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Προβολή"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Προβολή/_Προς"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Προβολή/_Κοινοποίηση"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Προβολή/Κ_ρυφή κοινοποίηση"
 
-#: src/compose.c:617
+#: src/compose.c:622
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Προβολή/_Απάντηση σε"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Προβολή/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Προβολή/_Συνέχεια προς"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Προβολή/_Χάρακας"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Προβολή/Σ_υνημμένου"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Προβολή/Προσαρμογή ε_ργαλειοθήκης..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/_Αυτόματη"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Δυτικής Ευρώπης (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κεντρικής Ευρώπης (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/_Βαλτικής (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Βαλτικής (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Βαλτικής (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ελληνικά (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Αραβική (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Αραβική (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Εβραϊκή (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Εβραϊκή (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Τούρκικη (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ιαπωνέζικη (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κορεάτικη (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ταϊλανδέζικη (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ταϊλανδέζικη (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Εργαλεία/_Ευρετήριο διευθύνσεων"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Εργαλεία/_Πρότυπο"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Εργαλεία/Ε_νέργειες"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Εργαλεία/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Εργαλεία/Επεξεργασία με ε_ξωτερικό πρόγραμμα"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Εργαλεία/_Υπογραφή με PGP"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Ε_πιλογές/_Κρυπτογράφηση με PGP"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Εργαλεία/Ορθογραφικός έλε_γχος"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Εργαλεία/Ορισμός _γλώσσας ορθογραφίας"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Δεν είναι δυνατή η λήψη του κειμένου\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Σφάλμα μορφοποίησης σημείωσης παράθεσης."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Σφάλμα στην απάντηση/προώθηση του μηνύματος."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Δεν είναι δυνατή η λήψη του μεγέθους του %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι κενό."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Δεν είναι δυνατή η ανάγνωση του %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Μήνυμα: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Δεν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Χωρίς θέμα)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Yπογραφή"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Δεν έχει οριστεί παραλήπτης."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Κενό θέμα"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Το θέμα είναι κενό. Να γίνει η αποστολή;"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Συνημμένα"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Θέμα:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 #, fuzzy
 msgid "_Send"
 msgstr "Αποστολή"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "δεν είναι δυνατή η λήψη λίστας παραληπτών."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1751,45 +1761,45 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Δημιουργήθηκε σφάλμα κατά την αποστολή του μηνύματος στο %s ."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Δεν ήταν δυνατή η εύρεση του κλειδιού που σχετίζεται με το επιλεγμένο "
 "αναγνωριστικό `%s'."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 #, fuzzy
 msgid "can't change file mode\n"
 msgstr "Η αλλαγή της κατάστασης του `%s' απέτυχε"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1800,11 +1810,11 @@ msgstr ""
 "του μηνύματος στο προσδιορισμένο σύνολο %s.\n"
 "Να αποσταλεί ως %s;"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής κώδικα"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1817,15 +1827,15 @@ msgstr ""
 "\n"
 "Να γίνει αποστολή;"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Όριο μήκους γραμμής"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Κρυπτογράφηση στους κρυφούς παραλήπτες"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1839,97 +1849,107 @@ msgstr ""
 "\n"
 "Να γίνει η αποστολή;"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "Δεν είναι δυνατή η διαγραφή του παλιού μηνύματος\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "προσθήκη στην ουρά...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "Δεν είναι δυνατή η εύρεση του πηγαίου φακέλου."
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Δεν είναι δυνατή η σημείωση του αρχείου.\n"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Δημιουργία παραθύρου σύνθεσης...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Υπογραφή PGP"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "Κρυπτογράφηση PGP"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Ημερομηνία"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Yπογραφή"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Έλεγχος υπογραφής."
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει ή είναι άδειο."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διαδρομή"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: το αρχείο δεν υπάρχει\n"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Άνοιγμα εκτελέσιμου αρχείου"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1937,14 +1957,14 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, fuzzy, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr ""
 "Η εντολή εκτύπωσης είναι άκυρη:\n"
 "'%s'"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1954,49 +1974,49 @@ msgstr ""
 "Να επιβάλω τερματισμό της διεργασίας;\n"
 "process group id: %d"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "Προσαρμο_γή εργαλειοθήκης..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Επιλογή αρχείων"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Αποθήκευση μηνύματος"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Αυτό το μήνυμα έχει τροποποιηθεί. Θέλετε να το αποθηκεύσετε στα πρόχειρα;"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Κλείσιμο _χωρίς αποθήκευση"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε να εφαρμόσετε το πρότυπο '%s' ;"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Εφαρμογή προτύπου"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Εισαγωγή"
 
@@ -2037,7 +2057,7 @@ msgid "Nick Name"
 msgstr "Ψευδώνυμο"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
@@ -2096,7 +2116,7 @@ msgid " Check File "
 msgstr " Έλεγχος αρχείου "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Αρχείο"
 
@@ -2105,62 +2125,62 @@ msgstr "Αρχείο"
 msgid "Add New Address Book"
 msgstr "Νέο ευρετήριο διευθύνσεων"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Θα πρέπει να καθοριστεί όνομα ομάδας."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Επεξεργασία δεδομένων ομάδας"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Όνομα ομάδας"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Διαθέσιμες διευθύνσεις"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Διευθύνσεις στην ομάδα"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Μετακινήστε διευθύνσεις μέσα ή έξω από την ομάδα με τα βελάκια"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Επεξεργασία λεπτομερειών ομάδας"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Δημιουργία νέας ομάδας"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Επεξεργασία φακέλου"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Εισάγετε το νέο όνομα του φακέλου:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Νέος φάκελος"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Εισάγετε το όνομα του νέου φακέλου:"
 
@@ -2177,7 +2197,7 @@ msgid "Edit JPilot Entry"
 msgstr "Επεξεργασία εγγραφής JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2242,7 +2262,7 @@ msgstr "Λήξη χρονικού ορίου (δευτ)"
 msgid "Maximum Entries"
 msgstr "Μέγιστες εγγραφές"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Βασικά"
 
@@ -2336,7 +2356,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Επιλογή ... "
 
@@ -2528,12 +2548,12 @@ msgstr "Ορισμός πληροφοριών φακέλου...\n"
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες φακέλων..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση φακέλων %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση φακέλου %s ..."
@@ -3384,701 +3404,711 @@ msgstr ""
 "Βρέθηκε η προηγούμενη έκδοση των ρυθμίσεων.\n"
 "Θέλετε να τις μεταφέρετε;"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Αρχείο/_Φάκελος"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Αρχείο/_Φάκελος/Δημιουργία _νέου φακέλου..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Αρχείο/_Φάκελος/Μετ_ονομασία φακέλου..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Αρχείο/_Φάκελος/_Μετακίνηση φακέλου..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Αρχείο/_Φάκελος/_Διαγραφή φακέλου..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Αρχείο/_Γραμματοκιβώτιο"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Αρχείο/_Γραμματοκιβώτιο/Προσθήκη _γραμματοκιβωτίου"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Αρχείο/_Γραμματοκιβώτιο/_Διαγραφή γραμματοκιβωτίου"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Αρχείο/_Γραμματοκιβώτιο/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Αρχείο/_Γραμματοκιβώτιο/Έλεγ_χος για νέα μηνύματα"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/_Αρχείο/_Γραμματοκιβώτιο/Έλεγχος για _νέα μηνύματα σε όλους τους φακέλους"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Αρχείο/_Γραμματοκιβώτιο/Ανακατασκε_υή διάταξης φακέλων"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 #, fuzzy
 msgid "/_File/_Import mail data..."
 msgstr "/_Αρχείο/Ε_ισαγωγή αρχείου mbox..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_File/_Export mail data..."
 msgstr "/_Αρχείο/_Εξαγωγή σε αρχείο mbox..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Αρχείο/Άδειασμα όλων _των φακέλων Απορριμμάτων"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Αρχείο/Αποθήκευση _ως..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Αρχείο/_Διαμόρφωση σελίδας..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Αρχείο/Εκτύ_πωση..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Αρχείο/Εργασία χωρίς σύνδεση"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Αρχείο/Έ_ξοδος"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Επεξεργασία/Επιλογή _νήματος"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Επεξεργασία/Εύ_ρεση στο τρέχον μήνυμα..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Επεξεργασία/Αναζήτη_ση..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 #, fuzzy
 msgid "/_Edit/_Quick search"
 msgstr "/_Επεξεργασία/Ε_πικόλληση"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Προβολή/Εμφάνιση ή α_πόκρυψη"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Προβολή/Εμφάνιση ή α_πόκρυψη/Στήλη _φακέλων"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Προβολή/Εμφάνιση ή α_πόκρυψη/Προβολή _μηνύματος"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Προβολή/Εμφάνιση ή α_πόκρυψη/_Εργαλείοθήκη"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Προβολή/Εμφάνιση ή α_πόκρυψη/_Εργαλείοθήκη/Εικονίδια κ_αι κείμενο"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr ""
 "/Προβολή/Εμφάνιση ή α_πόκρυψη/_Εργαλείοθήκη/Κείμενο στα _δεξιά του εικονιδίου"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Προβολή/Εμφάνιση ή α_πόκρυψη/_Εργαλείοθήκη/_Εικονίδια"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Προβολή/Εμφάνιση ή α_πόκρυψη/_Εργαλείοθήκη/_Κείμενο"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Προβολή/Εμφάνιση ή α_πόκρυψη/_Εργαλείοθήκη/_Απόκρυψη"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Προβολή/Εμφάνιση ή α_πόκρυψη/Γραμμή _αναζήτησης"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Προβολή/Εμφάνιση ή α_πόκρυψη/Γραμμή _κατάστασης"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Προβολή/Π_ροσαρμογή εργαλειοθήκης..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 #, fuzzy
 msgid "/_View/Layou_t"
 msgstr "/_Προβολή/_Ταξινόμηση"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 #, fuzzy
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά _αποστολέα"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr ""
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Προβολή/Αποσύνδεση στήλης _φακέλων"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Προβολή/Αποσύνδεση προβολής _μηνύματος"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Προβολή/_Ταξινόμηση"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά _νούμερο"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά _μέγεθος"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά _χρονολογία"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά χρονολογία νή_ματος"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά _αποστολέα"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά πα_ραλήπτη"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά _θέμα"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά χρ_ωματική ταμπέλα"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά _σημείωση"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Προβολή/_Ταξινόμηση/μη αναγν_ωσμένα"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά συν_ημμένο"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Προβολή/_Ταξινόμηση/Ατα_ξινόμητα"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Προβολή/_Ταξινόμηση/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Προβολή/_Ταξινόμηση/Αύξουσα"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Προβολή/_Ταξινόμηση/Φθίνουσα"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Προβολή/_Ταξινόμηση/_Ομαδοποίηση κατά θέμα"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Προβολή/Κατάταξη σε _νήματα"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Προβολή/Ανάπτυ_ξη όλων των νημάτων"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Προβολή/Σύμπτ_υξη όλων των νημάτων"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "Ορισμός εικονιδίου για προβολή"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Προβολή/Μετά_βαση"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Προβολή/Μετά_βαση/_Προηγούμενο μήνυμα"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Προβολή/Μετά_βαση/_Επόμενο μήνυμα"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Προβολή/Μετά_βαση/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Προβολή/Μετά_βαση/Π_ροηγούμενο μη αναγνωσμένο μήνυμα"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Προβολή/Μετά_βαση/Ε_πόμενο μη αναγνωσμένο μήνυμα"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Προβολή/Μετά_βαση/Προηγούμενο _νέο μήνυμα"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Προβολή/Μετά_βαση/Επόμενο νέο μήνυμα"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Προβολή/Μετά_βαση/Προηγούμενο _σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Προβολή/Μετά_βαση/Επόμενο σ_ημειωμένο μήνυμα"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 #, fuzzy
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Απεικόνιση/Μετάβαση/Προηγούμενο σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 #, fuzzy
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Προβολή/Μετά_βαση/Επόμενο σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Προβολή/Μετά_βαση/Ά_λλο φάκελο..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/_Αυτόματη αναγνώριση"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Δυτικής Ευρώπης (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ιαπωνέζικη (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ιαπωνέζικη (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ιαπωνέζικη (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Παραδοσιακή Κινέζικη (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κινέζικη (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κορεάτικη (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Προβολή/Άνοι_γμα σε νέο παράθυρο"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Προβολή/Πηγαίος _κώδικας μηνύματος"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/Προ_βολή/Ό_λων των κεφαλίδων"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Προβολή/Ανανέ_ωση"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Μήνυμα"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_Μήνυμα/_Λήψη"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Μήνυμα/_Λήψη/Από τον _τρέχοντα λογαριασμό"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Μήνυμα/_Λήψη/Από _όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Μήνυμα/_Λήψη/_Ακύρωση λήψης"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Μήνυμα/_Λήψη/Από _όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Μήνυμα/_Λήψη/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Μήνυμα/Αποστολή μηνυμάτων στην _ουρά"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Μήνυμα/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Μήνυμα/Σύνθεση _νέου μηνύματος"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Μήνυμα/Α_πάντηση"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Μήνυμα/Απάντηση _σε"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Μήνυμα/Απάντηση _σε/όλ_ους"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Μήνυμα/Απάντηση _σε/_αποστολέα"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Μήνυμα/Απάντηση _σε/_λίστα αλληλογραφίας"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Μήνυμα/_Προώθηση"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Μήνυμα/Π_ροώθηση ως συνημμένο"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Μήνυμα/Αναμε_τάδοση"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Μήνυμα/_Μετακίνηση..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Μήνυμα/_Αντιγραφή..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Μήνυμα/Σ_ημείωση"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 #, fuzzy
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Μήνυμα/Σ_ημείωση/Σ_ημείωση"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Μήνυμα/Σ_ημείωση/_Αναίρεση σημείωσης"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Μήνυμα/Σ_ημείωση/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Μήνυμα/Σ_ημείωση/Ως _μη αναγνωσμένο"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Μήνυμα/Σ_ημείωση/Ως _αναγνωσμένο"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Μήνυμα/Σ_ημείωση/_Νήμα ως αναγνωσμένο"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Μήνυμα/Σ_ημείωση/Ό_λων ως αναγνωσμένα"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Μήνυμα/_Διαγραφή"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Μήνυμα/Α_νεπιθύμητη αλληλογραφία"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Μήνυμα/Επιθ_υμητή αλληλογραφία"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Μήνυμα/Επαν-_επεξεργασία"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Εργαλεία/Προσθήκη αποστολέα στο ευρετήριο _διευθύνσεων"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Εργαλεία/_Φιλτράρισμα όλων των μηνυμάτων στο φάκελο"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Εργαλεία/Φιλτράρισμα ε_πιλεγμένων μηνυμάτων"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου/_Αυτόματα"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου/από τον απο_στολέα"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου/από τους _παραλήπτες"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου/από το _θέμα"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Εργαλεία/Φιλτράρισμα α_νεπιθύμητης αλληλογραφίας στο φάκελο"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr ""
 "/_Εργαλεία/Φιλτράρισμα αν_επιθύμητης αλληλογραφίας στα επιλεγμένα μηνύμάτα"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Εργαλεία/Διαγραφή δ_ιπλών μηνυμάτων"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 #, fuzzy
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Εργαλεία/Διαγραφή δ_ιπλών μηνυμάτων"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Εκτέλεσης σημειωμένης διεργασίας"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Εργαλεία/Φιλτράρισμα α_νεπιθύμητης αλληλογραφίας στο φάκελο"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Εργαλεία/_Φιλτράρισμα όλων των μηνυμάτων στο φάκελο"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Εργαλεία/Πα_ράθυρο καταγραφής"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Ρυθμίσεις"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Ρυθμίσεις/_Κοινές προτιμήσεις..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 #, fuzzy
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Ρυθμίσεις/Ρυθμίσεις _φίλτρων..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Ρυθμίσεις/Πρό_τυπα..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Ρυθμίσεις/Ενέργε_ιες..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 #, fuzzy
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Ρυθμίσεις/Πρό_τυπα..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Ρυθμίσεις/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Ρυθμίσεις/_Προτιμήσεις ενεργού λογαριασμού..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Ρυθμίσεις/Δημιουργία _νέου λογαριασμού..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Ρυθμίσεις/_Επεξεργασία λογαριασμών..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Ρυθμίσεις/Α_λλαγή ενεργού λογαριασμού"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Βοήθεια/_Τεκμηρίωση"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Βοήθεια/_Τεκμηρίωση/_Αγγλική"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Βοήθεια/_Τεκμηρίωση/_Ιαπωνική"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Βοήθεια/Συ_χνές ερωτήσεις"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/Βοήθεια/Συ_χνές ερωτήσεις/_Αγγλικά"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Βοήθεια/Συ_χνές ερωτήσεις/_Γερμανικό"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Βοήθεια/Συ_χνές ερωτήσεις/_Ισπανικά"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/Βοήθεια/Συ_χνές ερωτήσεις/_Γαλλικά"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Βοήθεια/Συ_χνές ερωτήσεις/_Ιταλικό"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Βοήθεια/_Επιλογές γραμμής εντολών"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Βοήθεια/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr ""
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr ""
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Δημιουργία κύριου παραθύρου...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "έγινε.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Χωρίς τίτλο"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "κανένα"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Χωρίς σύνδεση"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Είστε αποσυνδεδεμένος. Θέλετε να συνδεθείτε;"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Άδειασμα απορριμμάτων"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Διαγραφή όλων των μηνυμάτων σε όλους τους φακέλους απορριμμάτων;"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Προσθήκη γραμματοκιβωτίου"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -4088,16 +4118,16 @@ msgstr ""
 "Αν οριστεί το υπάρχον γραμματοκιβώτιο, θα\n"
 "σαρωθεί αυτόματα."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Το γραμματοκιβώτιο '%s' υπάρχει ήδη."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Γραμματοκιβώτιο"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4106,100 +4136,100 @@ msgstr ""
 "Η δημιουργία του γραμματοκιβωτίου απέτυχε.\n"
 "Ίσως κάποια αρχεία να υπάρχουν ήδη, ή δεν έχετε δικαίωμα να γράψετε εκεί."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Προβολή φακέλων"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Προβολή μηνύματος"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Απάντηση"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "Απάντηση σε Ό_λους"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Απάντηση στον απο_στολέα"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση στη _λίστα ηλεκτρονικού ταχυδρομείου"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/Πρ_οώθηση"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως συ_νημμένο"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Ε_κτροπή"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr ""
 "/Προβολή/Εμφάνιση ή α_πόκρυψη/_Εργαλείοθήκη/Κείμενο στα _δεξιά του εικονιδίου"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 #, fuzzy
 msgid "_Text"
 msgstr "Κείμενο"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 #, fuzzy
 msgid "_None"
 msgstr "Κανένα"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Είστε συνδεδεμένος. Κάντε κλικ στο εικονίδιο για να αποσυνδεθείτε."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Είστε συνδεδεμένος. Κάντε κλικ στο εικονίδιο για να αποσυνδεθείτε."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Έξοδος από το πρόγραμμα;"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Επιλογή φακέλου"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Επιλογές γραμμής εντολών"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Χρήση: sylpheed [ΕΠΙΛΟΓΗ]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4231,7 +4261,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4263,15 +4293,15 @@ msgstr ""
 "εμφάνιση αυτής της βοήθειας\n"
 "εμφάνιση πληροφοριών έκδοσης"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4514,238 +4544,238 @@ msgstr "Αρχείο"
 msgid "Description: "
 msgstr "Περιγραφή"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Άνοιγμα παράθυρου προτιμήσεων...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Λογαριασμός%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Επιλογές για το νέο λογαριασμό"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Προτιμήσεις λογαριασμού"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Δημιουργία παράθυρου προτιμήσεων λογαριασμού...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Λήψη"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Αποστολή"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Σύνθεση"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Απόρρητο"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Προχωρημένες"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Όνομα λογαριασμού"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Ορισμός ως προεπιλεγμένου"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Προσωπικές πληροφορίες"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Πλήρες όνομα"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Διεύθυνση αλληλογραφίας"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Πληροφορίες διακομιστή"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Νέα (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Κανένα (τοπικό)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Αυτός ο διακομιστής απαιτεί πιστοποίηση"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Διακομιστής νέων"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Εξυπηρέτης για λήψη"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Διακομιστής SMTP (αποστολή)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Όνομα χρήστη"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Χρήση ασφαλούς πιστοποίησης (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Διαγραφή μηνυμάτων από τον διακομιστή όταν παραληφθούν"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Διαγραφή μετά"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "ημέρες"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 μέρες: άμεση διαγραφή"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Λήψη όλων των μηνυμάτων (και των ήδη ληφθέντων) από τον διακομιστή"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Όριο μεγέθους για λήψη"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Προεπιλεγμένος φάκελος εισερχομένων"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Τα μη φιλτραρισμένα μηνύματα θα αποθηκεύονται σε αυτό τον φάκελο"
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Μέθοδος πιστοποίησης"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Αυτόματη"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Μόνο στη χειροκίνητη λήψη"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Νέα"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Μέγιστος αριθμός άρθρων που θα ληφθούν"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "χωρίς όριο αν θέσετε 0."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "Το `Λήψη όλων' ελέγχει για νέα μηνύματα σε αυτό το λογαριασμό"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Επικεφαλίδα"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Προσθήκη κεφαλίδας ημερομηνίας"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Δημιουργία Message-ID"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Προσθήκη κεφαλίδας ορισμένης από τον χρήστη"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Επεξεργασία... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Πιστοποίηση"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Πιστοποίηση SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4753,247 +4783,251 @@ msgstr ""
 "Εάν αφήσετε αυτά τα πεδία άδεια, θα χρησιμοποιηθούν το ίδιο όνομα χρήστη και "
 "κωδικός όπως για τη λήψη."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Πιστοποίηση με POP3 πριν την αποστολή"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Yπογραφή"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Απευθείας εισαγωγή"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Όνομα:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Αποτέλεσμα γραμμής εντολών"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Κοινοποίηση"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Κρυφή κοινοποίηση"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Απάντηση σε"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "Ψηφιακή υπογραφή μηνύματος ως προεπιλογή"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "Κρυπτογράφηση μηνύματος ως προεπιλογή"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Κρυπτογράφηση στην απάντηση κρυπτογραφημένων μηνυμάτων"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "δεν είναι δυνατή η λήψη λίστας παραληπτών."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Χρήση θωρακισμένης κατά ASCII μορφής για την κρυπτογράφηση"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Χρήση υπογραφής καθαρού κειμένου"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Χρήση προεπιλεγμένου κλειδιού GnuPG"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Επιλογή κλειδιού με βάση την διεύθυνση αλληλογραφίας"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Ορίστε με το χέρι το κλειδί"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Χρήστης ή key ID:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Να μην χρησιμοποιηθεί SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Χρήση SSL στη σύνδεση POP3"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Χρήση της εντολής STARTTLS για την έναρξη της συνόδου SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Χρήση SSL στη σύνδεση IMAP4"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Χρήση SSL στη σύνδεση NNTP"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Αποστολή (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Χρήση SSL στη σύνδεση SMTP"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Χρήση non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Απενεργοποιήστε το εάν έχετε προβλήματα σύνδεσης με το SSL"
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 #, fuzzy
 msgid "Hostname:"
 msgstr "Όνομα διακομιστή"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 #, fuzzy
 msgid "Port:"
 msgstr "Θύρα"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 #, fuzzy
 msgid "Use authentication"
 msgstr "Πιστοποίηση"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Όνομα:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 #, fuzzy
 msgid "Password:"
 msgstr "Συνθηματικό"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 #, fuzzy
 msgid "Use SOCKS proxy on sending"
 msgstr "Χρήση εξωτερικού προγράμματος για αποστολή"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Θύρα SMTP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Θύρα POP3"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Θύρα IMAP4"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Θύρα NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Όνομα τομέα"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Κατάλογος διακομιστή IMAP"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Θα εμφανίζονται μόνο οι υποφάκελοι αυτού του καταλόγου."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Λήψη όλων των μηνυμάτων από τον διακομιστή"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Αποθήκευση των σταλμένων στο"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Αποθήκευση πρόχειρων στο"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Αποθήκευση μηνυμάτων που βρίσκονται στην ουρά στο"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Αποθήκευση διαγραμμένων μηνυμάτων στο"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Δεν έχει εισάγει όνομα λογαριασμού."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Η διεύθυνση αλληλογραφίας δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Ο διακομιστής SMTP δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Δεν έχετε εισάγει όνομα χρήστη."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Ο διακομιστής POP3 δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Ο διακομιστής IMAP4 δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Ο διακομιστής NNTP δεν έχει οριστεί."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Ο ορισμένος φάκελος δεν είναι φάκελος ουράς."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/es.po b/po/es.po
index 10554498..c699e934 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: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2014-03-26 21:36+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -27,202 +27,207 @@ msgstr "Filtro de correo basura (manual)"
 msgid "Junk mail filter"
 msgstr "Filtro de correo basura"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexión IMAP4 con %s se ha roto. Reconectando...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "El servidor IMAP4 deshabilita LOGIN.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "No puedo establecer la conexión IMAP4.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creando conexión IMAP4 con %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "No puedo iniciar la sesión TLS.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(recuperando FLAGS...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "Obteniendo mensaje %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Agregando mensajes a %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Moviendo mensajes %s a %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensajes %s a %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Borrando mensajes %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "no puedo establecer los flags borrados: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "no puedo vaciar\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Borrando todos los mensajes en %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "no puedo establecer los flags borrados: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "no se puede cerrar la carpeta\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "la carpeta raíz %s no existe\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "hubo un error obteniendo LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "No puedo crear «%s»\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "No puedo crear «%s» bajo Entrada\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "no puedo crear el buzón\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no puedo renombrar el buzón: %s a %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "no puedo borrar el buzón\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Obteniendo las cabeceras de mensaje (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "error obteniendo la estructura del mensaje.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "No se puede interpretar la estructura del mensaje: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "no se puede obtener la estructura del mensaje\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar con el servidor IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "No puedo establecer la sesión IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "no se puede obtener el espacio de nombres\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "error en el mandato imap: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "La autentificación IMAP falló.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "no puedo añadir %s a %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(enviando fichero...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "no se puede añadir el mensaje a %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "no puedo copiar %s a %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "error en el mandato imap: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "error en el mandato imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "error en el mandato imap: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no puede convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no puede convertir %s a UTF-7\n"
@@ -498,7 +503,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "hubo algún error en la sesión POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "fallo escribiendo la configuración al fichero\n"
@@ -550,50 +555,50 @@ msgstr "respuesta SMTP errónea\n"
 msgid "error occurred on SMTP session\n"
 msgstr "hubo algún error en la sesión SMTP\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 no está disponible\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 disponible\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 no está disponible\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 disponible\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "Método SSL no disponible\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Método SSL desconocido *ERROR EN EL PROGRAMA*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Error creando el contexto SSL\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Conexión SSL usando %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Certificado del servidor:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Asunto: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Emisor: %s\n"
@@ -653,7 +658,7 @@ 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_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -690,14 +695,14 @@ msgstr ""
 "en la columna «G» para habilitar la descarga mediante «Recibir todo»."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Nombre"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -825,13 +830,13 @@ 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:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Dirección"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notas"
 
@@ -843,7 +848,7 @@ msgstr "Seleccionar carpeta de la agenda"
 msgid "Auto-registered address"
 msgstr "Direcciones auto-registradas"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Fichero"
@@ -864,10 +869,10 @@ msgstr "/_Fichero/Nuevo _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichero/Nuevo servidor _LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Fichero/---"
@@ -884,21 +889,21 @@ msgstr "/_Fichero/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
@@ -942,7 +947,7 @@ msgstr "/_Dirección/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Herramientas"
@@ -955,12 +960,12 @@ msgstr "/_Herramientas/Importar fichero _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Herramientas/Importar fichero _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -978,7 +983,7 @@ msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1020,7 +1025,7 @@ msgstr "Agenda de direcciones"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -1032,17 +1037,17 @@ msgstr "Dirección e-mail"
 msgid "Search:"
 msgstr "Buscar:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1251,7 +1256,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1307,392 +1312,397 @@ msgstr "Marrón"
 msgid "None"
 msgstr "Ninguno"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Abrir"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Añadir"
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Fichero/_Enviar"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Mensaje/Enviar _más tarde"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensaje/_Guardar en borradores"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensaje/Guardar y _seguir editando"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Fichero/_Adjuntar fichero"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Fichero/_Insertar fichero"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichero/Insertar _firma"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Fichero/Agregar _firma"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Deshacer"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Recortar todas las líneas largas"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Ver"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia (Cc)"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Ver/C_opia oculta (Bcc)"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/_Ver/_Responder a"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/_Ver/_Followup-To"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regleta"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adjuntos"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ver/Configurar barra de _herramientas..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/Codificación de caract_eres"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Ver/Codificación de caract_eres/_Automática"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/Codificación de caract_eres/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/Codificación de caract_eres/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/Codificación de caract_eres/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/Codificación de caract_eres/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/Codificación de caract_eres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/Codificación de caract_eres/Griego (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ver/Codificación de caract_eres/Arábigo (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ver/Codificación de caract_eres/Arábigo (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/Codificación de caract_eres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Herramientas/Editar con el editor e_xterno"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/Herramientas/Solicitar notificación de _disposición"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Herramientas/Fir_mar con PGP"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Herramientas/_Cifrar con PGP"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Herramientas/_Comprobar ortografía"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Herramientas/_Establecer idioma ortográfico"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: el fichero no existe\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "No se puede obtener la parte de texto\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, 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:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componer%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Firma"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Asunto vacío"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Falta el adjunto"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "No hay adjunto. ¿Enviarlo sin adjuntos?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Comprobar destinatarios"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "¿Enviar realmente este correo a las direcciones siguientes?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
@@ -1700,11 +1710,11 @@ msgstr ""
 "La comprobación de mensajes nuevos se está ejecutando actualmente.\n"
 "Por favor, inténtelo de nuevo más tarde."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1712,12 +1722,12 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta de correo antes de enviar."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
@@ -1725,30 +1735,30 @@ msgstr ""
 "Se completó el envío del mensaje, pero no se pudo guardar el mensaje en "
 "Salida."
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "No se encontró ninguna clave asociada al ID de clave seleccionado "
 "actualmente «%s»."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "El mensaje no se puede firmar."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "El mensaje no se puede cifrar."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "El mensaje no se puede cifrar o firmar."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1759,11 +1769,11 @@ msgstr ""
 "\n"
 "¿Enviarlo como %s de todas formas?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1776,15 +1786,15 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Cifrando con copia oculta"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1798,94 +1808,104 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "El fichero %s no existe."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "No se puede abrir el fichero %s."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Tipo de datos"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Firma"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Verificando firma"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "El fichero no existe."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Abriendo fichero ejecutable"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1897,12 +1917,12 @@ msgstr ""
 "Si quiere lanzarlo, guárdelo en algún lugar y asegúrese de que no es un "
 "virus u otro tipo de software malintencionado."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, 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:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1911,48 +1931,48 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "_Configurar barra de herramientas..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Este mensaje ha sido modificado. ¿Guardarlo en la carpeta Borradores?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -1993,7 +2013,7 @@ msgid "Nick Name"
 msgstr "Apodo"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Dirección de correo"
 
@@ -2051,7 +2071,7 @@ msgid " Check File "
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Fichero"
 
@@ -2059,62 +2079,62 @@ msgstr "Fichero"
 msgid "Add New Address Book"
 msgstr "Añadir una nueva agenda"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Debe proporcionar un nombre de grupo"
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Editar datos del grupo"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Direcciones disponibles"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Direcciones en el grupo"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mover las direcciones de correo desde/hacia el grupo con las flechas"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Editar detalles del grupo"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Añadir nuevo grupo"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Editar carpeta"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2131,7 +2151,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2196,7 +2216,7 @@ msgstr "Tiempo límite (seg.)"
 msgid "Maximum Entries"
 msgstr "Nº máximo de entradas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Básico"
 
@@ -2284,7 +2304,7 @@ msgid "MH (number only)"
 msgstr "MH (sólo número)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Seleccionar..."
 
@@ -2465,12 +2485,12 @@ msgstr "Estableciendo la información de la carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Estableciendo la información de la carpeta..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -3297,682 +3317,692 @@ msgstr ""
 "Se encontró una versión anterior de la configuración.\n"
 "¿Desea migrarla?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Fichero/_Carpeta"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fichero/_Carpeta_/Crear _nueva carpeta..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fichero/_Carpeta_/_Renombrar carpeta..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fichero/_Carpeta_/_Mover carpeta..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fichero/_Carpeta_/_Borrar carpeta"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Fichero/_Buzón"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fichero/_Buzón/_Añadir buzón..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fichero/_Buzón/_Eliminar buzón"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fichero/_Buzón/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fichero/_Buzón/_Comprobar si hay mensajes nuevos"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fichero/_Buzón/_Comprobar mensajes nuevos en todas las carpetas"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fichero/_Buzón/R_econstruir árbol de carpetas"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_Fichero/I_mportar correo..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_Fichero/_Exportar correo..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Fichero/_Vaciar todas las papeleras"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Fichero/_Guardar como..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Fichero/Config_urar página..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Fichero/_Imprimir..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Fichero/_Trabajar sin conexión"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Fichero/Sali_r"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _hilo"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar en el mensaje actual..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edición/_Buscar en los mensajes..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/_Editar/Búsqueda _rápida"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Ver/Mostrar u o_cultar"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ver/Mostrar u o_cultar/_Árbol de carpetas"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ver/Mostrar u o_cultar/Vista de _mensajes"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/Iconos _y texto"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/Texto a la de_recha del icono"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Iconos"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Texto"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Ocultar"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Ver/Mostrar u o_cultar/Barra de bú_squeda"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar u o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Ver/_Ir a/_Configurar barra de herramientas..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/_Ver/_Aspecto"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Ver/_Aspecto/_Normal"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/_Ver/_Aspecto/_Vertical"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar árb_ol de carpetas"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensajes"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordenar"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordenar/Por _número"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordenar/Por _tamaño"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordenar/Por _fecha"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Ver/_Ordenar/Por _fecha del hilo"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordenar/Por _remitente"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordenar/Por _destinatario"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordenar/Por a_sunto"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordenar/Por _color de la etiqueta"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordenar/Por _marca"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ver/_Ordenar/Por _no leído"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordenar/Por adj_unto"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordenar/N_o ordenar"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordenar/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordenar/Ascendente"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordenar/Descendente"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordenar/Atraer _por asunto"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista jerárquica"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos los hilos"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos los hilos"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Ver/Elementos visibles..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaje a_nterior"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaje s_iguiente"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin leer"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Siguiente sin leer"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaje nue_vo anterior"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaje n_uevo s_iguiente"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaje marcado a_nterior"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje marcado"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaje etiquetado anterior"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje etiquetado"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/Codificación de caract_eres/_Autodetectar"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/Codificación de caract_eres/Chino (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en una ventana _nueva"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/_Ver/_Todas las cabeceras"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Mensaje"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaje/Reci_bir"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaje/Reci_bir/De la cuenta a_ctual"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaje/Reci_bir/De tod_as las cuentas"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Mensaje/Reci_bir/Detener la recepción"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Mensaje/Reci_bir/De un buzón _remoto..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaje/Reci_bir/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaje/Enviar mensa_jes en cola"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaje/Componer _nuevo mensaje"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Mensaje/_Responder"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaje/Respon_der a"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaje/Respon_der a/A _todos"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaje/Respon_der a/Al _remitente"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaje/Respon_der a/A la _lista de correo"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Mensaje/_Reenviar"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaje/Reen_viar como adjunto"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaje/Red_irigir"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaje/M_over..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaje/_Copiar..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Mensaje/_Marcar"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Mensaje/_Marcar/_Poner señal"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Mensaje/_Marcar/_Quitar señal"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaje/_Marcar/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaje/_Marcar/Marcar como no l_eído"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaje/_Marcar/Marcar como leí_do"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Mensaje/_Marcar/Marcar _hilo como leído"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaje/_Marcar/Marcar _todo como leído"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Mensaje/_Borrar"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensaje/Es un correo _basura"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaje/No es un correo _basura"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaje/Re_editar"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Herramientas/Añadir remitente a la age_nda..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Herramientas/_Filtrar todos los mensajes de la carpeta"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Herramientas/_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Herramientas/_Filtrar mensajes basura en la carpeta"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Herramientas/_Filtrar mensajes basura en los seleccionados"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Herramientas/Borrar los mensajes re_petidos"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Herramientas/C_oncatenar mensajes separados"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Herramientas/_Ejecutar el proceso marcado"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Herramientas/_Filtrar mensajes basura en la carpeta"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Herramientas/_Filtrar todos los mensajes de la carpeta"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Herramientas/_Ventana de traza"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comunes..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Acciones..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Configuración/Gestor de co_mplementos..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias de la cuenta actual..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear una _nueva cuenta..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar cuentas..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar la cuenta actual"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Ayuda/_Manual"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ayuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ayuda/_Manual/_Japonés"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Ayuda/_FAQ"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ayuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ayuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ayuda/_FAQ/_Español"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ayuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ayuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Ayuda/Op_ciones de línea de órdenes"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Ayuda/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/_Ayuda/Comprobar act_ualizaciones..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/_Ayuda/Com_probar actualizaciones de módulos..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Creando ventana principal...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Esta desconectado. ¿Conectar?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Vaciar todas las papeleras"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "¿Borrar todos los mensajes de las papeleras?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3982,16 +4012,16 @@ msgstr ""
 "Si el buzón especificado ya existe entonces será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4001,95 +4031,95 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Responder a _todos"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Responder al _remitente"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Icono _y texto"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Texto a la de_recha del icono"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "_Icono"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_Texto"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_Ninguno"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga clic en el icono para conectar."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga clic en el icono para desconectar."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "No se pudo combinar los mensajes seleccionados."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Seleccionar carpeta a abrir"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Opciones de línea de ordenes"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPCIÓN]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4123,7 +4153,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4157,15 +4187,15 @@ msgstr ""
 "muestra esta ayuda y termina\n"
 "muestra la información de la versión y termina"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Opción sólo para Windows:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport nºpuerto"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "especificar el puerto IPC para órdenes remotas"
 
@@ -4398,236 +4428,236 @@ msgstr "Fichero: "
 msgid "Description: "
 msgstr "Descripción: "
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Abriendo ventana de preferencias de cuenta...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Cuenta%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Preferencias para una nueva cuenta"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Preferencias de la cuenta"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Creando ventana de preferencias de cuenta...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Enviar"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Componer"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Nombre de esta cuenta"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Cuenta por defecto"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Información personal"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Dirección de correo"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organización"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Información del servidor"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Ninguna (local)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Este servidor requiere autentificación"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Servidor de noticias"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Contraseña"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autentificación segura (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Eliminar los mensajes del servidor al recibir"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Eliminar después de"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "días"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 días: eliminar inmediatamente"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Descargar todos los mensajes (incluso los ya recibidos) del servidor"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Tamaño límite para recibir"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "Kb"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Buzón por defecto"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Los mensajes sin filtrar se guardarán en esta carpeta."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Método de autentificación"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automática"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Sólo comprobar Entrada al recibir"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrar los nuevos mensajes en Entrada al recibir"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Noticias"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artículos a descargar"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Sin límite si se especifica 0."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "«Recibir todo» comprueba si hay mensajes nuevos en esta cuenta"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabecera"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Añadir campo Fecha"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Generar ID-Mensaje"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Autentificación"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificación SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4635,240 +4665,244 @@ msgstr ""
 "Si deja estos campos vacíos, se utilizará el mismo ID de usuario y "
 "contraseña usados para la recepción."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentificación con POP3 antes de enviar"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Firma"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Entrada directa"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Nombre:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Poner la firma antes de la cita (no se recomienda)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "Firmar el mensaje con PGP por defecto"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "Cifrar el mensaje con PGP por defecto"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Cifrar al responder a un mensaje cifrado"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 msgid "Add my own key to the recipients list on encryption"
 msgstr "Al cifrar añadir también mi clave a la lista de destinatarios"
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII blindado para el cifrado"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Usar firma de texto claro"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr "Clave de firma/cifrado"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Usar la clave GnuPG por defecto"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Seleccionar la clave por la dirección de correo"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Especificar la clave manualmente"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Usuario o ID de clave:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "No usar SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para la conexión POP3"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar el mandato STARTTLS para abrir la sesión SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para la conexión IMAP4"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para la conexión NNTP"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para la conexión SMTP"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Utilizar SSL no bloqueante"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Desactívelo si tiene problemas con la conexión SSL."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "Usar proxy SOCKS"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Nombre de máquina:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Usar autentificación"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Nombre:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Usar un proxy SOCKS al enviar"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Puerto SMTP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Puerto POP3"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Puerto IMAP4"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Puerto NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Nombre del dominio"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP4"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Sólo se mostrarán las subcarpetas de este directorio."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Limpiar todas las caches de mensajes al salir"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Poner mensajes para la cola en"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de cuenta."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "No se especificó el servidor SMTP."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "No se especificó el usuario."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "No se especificó el servidor POP3."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "No se especificó el servidor IMAP4."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "No se especificó el servidor NNTP."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "La carpeta especificada no es una carpeta de cola."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/et.po b/po/et.po
index e3801a2f..4959b96d 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: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+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"
@@ -29,210 +29,215 @@ msgstr "Kaust"
 msgid "Junk mail filter"
 msgstr "Kaust"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 ühendus %s:%d-ga katkes. Taasühendan...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP serveri kataloog"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 #, fuzzy
 msgid "Could not establish IMAP connection.\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "loon IMAP4 ühendust %s:%d-ga ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Ei suuda avada TLS sessiooni.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, fuzzy, c-format
 msgid "Getting message %u"
 msgstr "Kustutan kirja %d"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Liigutan kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ei suutnud seada kustutatu lippu: %d\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "ei suuda väljastada\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ei suutnud seada kustutatu lippu: 1:%d\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "*Märgi faili ei leidunud.\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "Nimistu saamisel tekkis viga.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ei suuda luua '%s'\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ei suuda luua '%s' Sisendkasti all\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ei suuda luua kirjakasti: Nimistu ebaõnnestus\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "ei suuda luua kirjakasti\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "ei suuda luua kirjakasti\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ei suuda kirjakasti %s-lt ümber nimetada %s-le\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "ei suuda kustutada kirjakasti\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "ümbriku võtmisel tekis viga.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ei suutnud avada ümbrikut: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "ei suuda võtta ümbrikut\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "ei suutnud leida nime asukohta\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autoriseerimise meetod"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 sissekirjutus ebaõnnestus.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ei suuda %s-d lisada %s-i\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(saadan faili...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ei suuda lisada kirja %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ei suuda %d-d kopeerida %s-i\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imapi käsu täitmisel tekkis viga: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ei suuda konversteerida UTF-7-t %s-ks\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
@@ -505,7 +510,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "autoriseerimisel tekkis viga\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "Häälestuse salvestamine ebaõnnestus\n"
@@ -558,50 +563,50 @@ msgstr ""
 msgid "error occurred on SMTP session\n"
 msgstr "autoriseerimisel tekkis viga\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 pole kättesaadav\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 on kättesaadav\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 pole saadav\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 on saadav\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "SSL-i meetodit ei saa kasutada\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "ssl.c:94: Tundmatu SSL meetod *PROGRAMMI VIGA*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Viga ssl konteksti loomisel\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL ühendus kasutab %s-i\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Serveri srtifikaat:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Pealkiri: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Väljalaskja: %s\n"
@@ -659,7 +664,7 @@ msgstr ""
 "programmiga; kui ei, siis kirjuta: Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -698,14 +703,14 @@ msgstr ""
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Nimi"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -833,13 +838,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Aadress"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Märkused"
 
@@ -852,7 +857,7 @@ msgstr "Vali aadressiraamatu kaust"
 msgid "Auto-registered address"
 msgstr "Registreeritud reeglid"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Fail"
@@ -874,10 +879,10 @@ msgstr "/_Fail/Uus _JPiloot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Fail/---"
@@ -894,21 +899,21 @@ msgstr "/_Fail/Kustuta"
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
@@ -955,7 +960,7 @@ msgstr "/_Aadress/R_edigeeri"
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Tööriist"
@@ -969,12 +974,12 @@ msgstr "/_Tööriist/Impordi _LDIF fail"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
@@ -992,7 +997,7 @@ msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1036,7 +1041,7 @@ msgstr "Aadressiraamat"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Kaust"
 
@@ -1049,17 +1054,17 @@ msgstr "E-Posti aadress"
 msgid "Search:"
 msgstr "Otsi"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Kellele:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Pimekoopia:"
@@ -1273,7 +1278,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1329,449 +1334,454 @@ msgstr "Pruun"
 msgid "None"
 msgstr "Mittemiski"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/Ava"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/Lis_a..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/Eemalda"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Omadus..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Fail/_Salvesta"
 
-#: src/compose.c:581
+#: src/compose.c:586
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Kiri/Saada _hiljem"
 
-#: src/compose.c:584
+#: src/compose.c:589
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Kiri/Salvesta _mustandi kausta"
 
-#: src/compose.c:586
+#: src/compose.c:591
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Kiri/Salvesta ja jätka kirjutamist"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Fail/M_anusta fail"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Fail/L_isa fail"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fail/Lisa allkiri"
 
-#: src/compose.c:593
+#: src/compose.c:598
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Fail/Lisa allkiri"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/R_edigeeri/_Tühista"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "R_edigeeri/_Ennista"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/R-edaktor/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/R_edaktor/_Lõika"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/R_edaktor/Aseta kui tsitaat"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/R_edaktor/_Märgi kõik"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/R_edaktor/_Äärista aktiivne lõik"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/R_edaktor/Ää_rista kõik pikad read"
 
-#: src/compose.c:612
+#: src/compose.c:617
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Vaade"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Vaadde/_Kellele"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Vaade/Koopia"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Vaade/*_BCC"
 
-#: src/compose.c:617
+#: src/compose.c:622
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Vaade/_Vasta"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_vaade/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Vaade/*Järgneja"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Vaade/Joonla_ud"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Vaade/_Manus"
 
-#: src/compose.c:625
+#: src/compose.c:630
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vaade/_Kooditabel/7bitine ascii (US-ASCII)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vaade/_Kooditabel/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vaade/_Kooditabel/Kesk-Euroopa (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vaade/_Kooditabel/_Balti (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vaade/_Kooditabel/Türgi (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiine (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vaade/_Kooditabel/Tai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vaade/_Kooditabel/Tai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Tööriist/_Aadressiraamat"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Tööriist/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/R_edaktor/Redi_geeri välise redaktoriga"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:728
+#: src/compose.c:733
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:733
+#: src/compose.c:738
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Tööriist/Käivita"
 
-#: src/compose.c:734
+#: src/compose.c:739
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Ei saa tekstiosa kätte\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "*Tsitaadimärgi formaadi viga."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Allkiri"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 #, fuzzy
 msgid "Empty subject"
 msgstr "Pealkiri"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Manused"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Säti järgmised aadressid automaatselt"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Pealkiri:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 #, fuzzy
 msgid "_Send"
 msgstr "Saada"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Kõigis kaustades otsitakse uusi kirju..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1779,43 +1789,43 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, 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:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1825,12 +1835,12 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1839,15 +1849,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1856,99 +1866,109 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ei suuda avada faili %s\n"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Kuupäev"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Allkiri"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Allkirja kontroll"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 #, fuzzy
 msgid "File not exist."
 msgstr "faili %s ei leidu\n"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1956,12 +1976,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1971,52 +1991,52 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -2058,7 +2078,7 @@ msgid "Nick Name"
 msgstr "Hüüdnimi"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-Posti aadress"
 
@@ -2117,7 +2137,7 @@ msgid " Check File "
 msgstr " Kontrolli faili "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Fail"
 
@@ -2126,62 +2146,62 @@ msgstr "Fail"
 msgid "Add New Address Book"
 msgstr "Lisa uus aadressiraamat"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Grupi nimi peab olema antud."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Muuda grupi andmeid"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Grupi nimi"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Olemasolevad aadressid"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Aadress grupis"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Nihuta E-Posti aadressid gruppi või grupist kasutades nooleklahve"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Muuda grupi detaile"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Lisa uus grupp"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Redigeeri kausta"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi või kaust:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -2198,7 +2218,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigeeri JPilot sissekannet"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2263,7 +2283,7 @@ msgstr "Ajalimiit (sek)"
 msgid "Maximum Entries"
 msgstr "Sissekannete piirarv"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Baas"
 
@@ -2355,7 +2375,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Vali... "
 
@@ -2551,12 +2571,12 @@ msgstr "Sean kausta info...\n"
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
@@ -3397,736 +3417,746 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Fail/_Kaust"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fail/_Kaust/_Loo uus kaust..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fail/_Kaust/_Nimeta kaust ümber"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fail/_Kaust/_Nimeta kaust ümber"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fail/_Kaust/_Kustuta kaust"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Fail/_Lisa kirjakast..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fail/_Lisa kirjakast..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Ee_malda kirjakst"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fail/_Kaust"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Vaata uusi kirju"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fail/_Vaata uusi kirju kõigis kaustades"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Uuenda kausta puu"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 #, fuzzy
 msgid "/_File/_Import mail data..."
 msgstr "/_Fail/_Impordi kirjakasti fail..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_File/_Export mail data..."
 msgstr "/_Fail/_Ekspordi kirjakasti faili..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Fail/_Tühjenda prügikast"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Fail/_Salvesta kui..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Fail/_Salvesta kui..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Fail/_Trüki..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Fail/L_isa fail"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Fail/_Välju"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/R_edaktor/Märgi _teema"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redaktor/_Leia käesolevast kirjast..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Redaktor/_Otsi kirju..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 #, fuzzy
 msgid "/_Edit/_Quick search"
 msgstr "/R_edaktor/Ot_si kaustast"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Vaade/Näita või varja"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vaade/Näita või varja/Kausta_puud"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vaade/Näita või varja/Kirja_vaadet"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vaadde/Näita või varja/_Nupuribal"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/Pilti _ja teksti"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Pilti"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Pilti"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Teksti"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Mitte midagi"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Vaade/Näita või varja/Staatusri_ba"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vaade/Näita või varja/Staatusri_ba"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 #, fuzzy
 msgid "/_View/Layou_t"
 msgstr "/_Vaade/_Sorteeri"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 #, fuzzy
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Vaade/_Sorteeri/_vormi järgi"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr ""
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vaade/Eraldi kausta puu"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vaade/Eraldi kirja vaade"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Vaade/_Sorteeri"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vaade/_Sorteeri/_numbri järgi"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vaade/_Sorteeri/_suuruse järgi"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vaade/_Sorteeri/_kuupäeva järgi"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Vaade/_Sorteeri/_kuupäeva järgi"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vaade/_Sorteeri/_vormi järgi"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vaade/_Sorteeri/_suuruse järgi"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vaade/_Sorteeri/_pealkirja järgi"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vaade/_Sorteeri/v_ärvi järgi"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vaade/_Sorteeri/_märgi järgi"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vaade/_Sorteeri/m_itteloetute järgi"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vaade/_Sorteeri/kirja_lisade järgi"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vaade/_Sorteeri/Ära sorteeri"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Vaade/_Sorteeri/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/Vaade/_Sorteeri/Kasvavas järjekorras"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vaade/_Sorteeri/*'_Attract' subjekti järgi"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Vaade/Teema_vaade"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Vaade/Paisuta kõik teemad"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vaade/Sulge kõik teemad"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Vaade/Mää_ra näidatavad parameetrid"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Vaade/_Ava"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vaade/_Ava/Eelmine kiri"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vaade/_Ava/Järgmine kiri"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Vaade/_Ava/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Vaade/_Ava/_Eelmine mitteloetud kiri"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vaade/_Ava/_Järgmine mitteloetud kiri"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vaade/Mine/Eelmisele uuele kirjale"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vaade/Mine/Järgmisele uuele kirjale"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vaade/_Ava/Eelmine _märgitud kiri"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vaade/_Ava/Järgmine m_ärgitud kiri"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vaade/_Ava/Eelmine _sildiga kiri"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vaade/_Ava/Jägmine s_ildiga kiri"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vaade/_Kooditabel/Määra _Automaatselt"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiina (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vaade/_Kooditabel/Hiina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/Vaade/Ava uues aknas"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Vaade/Näita kirja lähtekoodi"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Vaade/Kõik päised"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Kiri"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Kiri/Katkesta kirjade võtmine"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Kiri/_Saada järjekorras olevad kirjad"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Kiri/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Kiri/Uus k_iri"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Kiri/Vasta/k_õigile"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Kiri/Vas_ta/_saatjale"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Kiri/Vasta/kirja _listi"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Kiri/Saada _edasi"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Kiri/Saada edasi _manusena"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Kiri/Suuna _ümber"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Kiri/_Nihuta..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Kiri/K_opeeri..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Kiri/M_ärk"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 #, fuzzy
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Kiri/M_ärk/M_ärgi"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Kiri/M_ärk/_Eemaldan märgi"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Kiri/M_ärk/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Kiri/M_ärk/Märgin _mitteloetuks"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Kiri/M_ärk/Märgin _loetuks"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Kiri/M_ärk/Märgin _loetuks"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Kiri/M_ärk/Märgin _kõik loetuks"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Kiri/Kustuta"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Tööriist/Lisa saatja aadressi raamatusse"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Tööriist/Loo filtri reeglistik"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Tööriist/Loo filtri reeglistik/Automaatselt"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades Kellelt"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Tööriist/Loo filtri reeglistik/kasutades Kellele"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades päälkirja"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Tööriist/_Kustuta topelt kirjad"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 #, fuzzy
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Tööriist/_Kustuta topelt kirjad"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Käivita märgitud protsess"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Tööriist/_Filtreeri kirjad"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Tööriist/_Filtreeri kirjad"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Tööriist/_Teadete aken"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Häälestus"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Häälestus/_Üldised omadused..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 #, fuzzy
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Häälestus/_Filtri seaded..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Häälestus/_Mall..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Häälestus/Tegevused..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 #, fuzzy
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Häälestus/_Mall..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Häälestus/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Häälestus/_Hetkel kasutatava konto omadused..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Häälestus/_Loo uus konto..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Häälestus/_Redigeeri kontosid..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Häälestus/_Muuda kasutatavat kontot"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Abi/_Juhend"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Abi/_Juhend/_Inglise"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Abi/_Juhend/_Jaapani"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Abi/_KKK"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Abi/_KKK/_Inglise"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Abi/_KKK/_Saksa"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Abi/_KKK/_Hispaania"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Abi/_KKK/_Prantsuse"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Abi/_KKK/_Itaalia"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Käsurida ei ole sisestatud."
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Abi/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr ""
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr ""
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Loon peamise akna...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "tehtud.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Tiitlita"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "mittemiski"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tühjenda prügikast"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Lisa kirjakast"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -4136,16 +4166,16 @@ msgstr ""
 "Sisesta kirjakasti asukoht.\n"
 "Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4154,104 +4184,104 @@ msgstr ""
 "Kirjakasti loomine ebaõnnestus.\n"
 "Võibolla mõned failid on olemas, või teil pole õigusi sinna kirjutamiseks."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - kausta vaade"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/Vastan"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Pilti"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 #, fuzzy
 msgid "_Text"
 msgstr "Tekst"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 #, fuzzy
 msgid "_None"
 msgstr "Mittemiski"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Välju"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Lõpetame programmi töö."
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Vali kaust"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 #, fuzzy
 msgid "Command line options"
 msgstr "Käsurida ei ole sisestatud."
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kauta: %s [SEADED]...\n"
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4270,7 +4300,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4289,15 +4319,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4545,245 +4575,245 @@ msgstr "Fail"
 msgid "Description: "
 msgstr "Seletus"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Avan konto parameetrite akent...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Uue konto omadused"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Konto omadused"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Loon konto omaduste akent...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Saabuvad kirjad"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Saada"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Kirjuta"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Privaatsus"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Spetsiaalne"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Selle konto nimi"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr " Määra vaikimisi kontoks "
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Isiku informatsioon"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Täisnimi"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "E-Posti aadress"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Ofganisatsioon"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Serveri informatsioon"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Uudised (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Lokaalarvutist"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "See servar nõuab autoriseerimist"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Uudiste server"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Sissetulevate kirjade server"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Saatmise server (SMTP)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Kasutajanimi"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Parool"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "See servar nõuab autoriseerimist"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Kustuta kirjad pärast kohalejõudmist serverist"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Eemalda pärast"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "päeva"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 päeva: eemalda kohe)"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Võta serverist kõik kirjad"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Tõmbamise suuruse limiit"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtreeri saabuvaid kirju"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Vaikimisi sisendkast"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Autoriseerimise meetod"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtreeri saabuvaid kirju"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Uudised"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksimaalne võetavate artiklite arv\n"
 "(määramata kui sisestate 0)"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Saaja pole määratud."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "Kui vajutate nuppu 'Võta kõik', siis uusi kirju võetakse ka siia"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Päis"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Lisa kuupäev päisesse"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Loo Kirja-ID"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Lisa kasutaja defineeritud päis"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Redigeeri... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Autoriseerimine"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autoriseerimine (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4792,251 +4822,255 @@ msgstr ""
 "Kui te jätate need sissekanded tühjaks, siis \n"
 "kasutatakse vastuvõtva kasutaja ID-d ja parooli."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Autoriseeri POP3 enne saatmist"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Allkiri"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Nimi:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 #, fuzzy
 msgid "Command output"
 msgstr "Käsklus"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Säti järgmised aadressid automaatselt"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Vastus saata"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Vaikimisi tuleb kiri allkirjastada"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Vaikimisi tuleb kiri krüpteerida"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "ei leia saajate nimistut."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Kasuta ASCII-ga varustatud krüpteerimise formaati"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Kasuta seleget teksti allkirja"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Kasuta algset GnuPG võtit"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Vali võti elektronposti aadressi juurest"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Määra võti käsitsi"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Kasutaja või võtme ID:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Ära kasuta SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Kasuta SSL-i POP3-e ühenduse jaoks"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Kasuta STARTTLS käsklust et alustada SSL sessiooni"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Kasuta SSL-i IMAP4-ja ühenduse jaoks"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Kasuta SSL-i NNTP ühenduse loomisel"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Saada (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Kasuta SSL-i SMTP ühenduse jaoks"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 #, fuzzy
 msgid "Hostname:"
 msgstr "Arvuti nimi"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 #, fuzzy
 msgid "Port:"
 msgstr "Port"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 #, fuzzy
 msgid "Use authentication"
 msgstr "Autoriseerimine"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Nimi:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 #, fuzzy
 msgid "Password:"
 msgstr "Parool"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 #, fuzzy
 msgid "Use SOCKS proxy on sending"
 msgstr "Kasuta saatmisel välist programmi"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Määra SMTP port"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Määra POP3 port"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Määra IMAP4 port"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Määra NNTP port"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Määra domeeni nimi"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP serveri kataloog"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Võta serverist kõik kirjad"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Pane saadetud kirjad"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Pane mustandi kirjad"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Pane kustutatud kirjad"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Pane kustutatud kirjad"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Konto nime ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Postiaadressi ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "SMTP serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Kasutajanime ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "POP3 serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 serverit ei ole sisestatud"
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "NNTP serverit ei ole sisestatud."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/eu.po b/po/eu.po
index af98ef60..0a63846a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2015-12-28 18:53+0100\n"
 "Last-Translator: Xabier Aramendi <azpidatziak@gmail.com>\n"
 "Language-Team: (EUS_Xabiera Aramendi) <azpidatziak@gmail.com>\n"
@@ -30,202 +30,207 @@ msgstr "Zabor posta iragazkia (eskuzkoa)"
 msgid "Junk mail filter"
 msgstr "Zabor posta iragazkia"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 elkarketa %s-ra eten egin da. Berrelkarketatzen...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 zerbitzariak SAIOHASTEA ezgaitzen du.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "Ezinezkoa IMAP elkarketa ezartzea\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "IMAP4 elkarketa sortzen hona: %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Ezin da TLS saioa hasi.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(IKURRAK berreskuratzen...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "%u mezua lortzen"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Mezuak gehitzen hona %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Mezuak mugitzen %s hona %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Mezuak kopiatzen %s hona %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Mezuak kentzen %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ezin dira ezarri ezabatutako ikurrak: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "ezin da ezabatu\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "%s-ko mezu guztiak kentzen"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ezin dira ezarri ezabatutako ikurrak: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "ezin da agiritegia itxi\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s erro agiritegia ez dago\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "akatsa gertatu da ZERRENDA lortzerakoan.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ezin da '%s sortu'\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ezin da '%s' sortu SARRERA-n\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ezin da postakutxa sortu: ZERRENDA hutsegitea\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "Ezin da postakutxa sortu\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "Ezin da postakutxa sortu\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ezin da postakutxa berrizendatu: %s honela %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "Ezin da postakutxa ezabatu\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Mezu idazburuak lortzen (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "akatsa gertatu da lana lortzerakoan.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ezin da lana aztertu: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "ezin da lana lortu\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ezin da IMAP4 zerbitzariarekin elkarketatu: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ezin da IMAP4 saioa ezarri honekin: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "ezin da izentartea lortu\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ezin da agiritegia hautatu: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "akatsa imap aginduan: EGOERA %s %s\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 egiaztapen hutsegitea.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 saio-haste hutsegitea.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ezin da %s hona %s gehitu\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(agiria bidaltzen...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ezin da mezua gehitu %s-ra\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ezin da %s  hona %s kopiatu\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "akatsa imap aginduan: BILTEGIA %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "akatsa imap aginduan: EZABA %s %s\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "akatsa imap aginduan: ITXI %s %s\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ezin du bihurtu UTF-7 %s-ra \n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ezin du bihurtu %s UTF-7-ra\n"
@@ -501,7 +506,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "akatsa gertatu da POP3 saioan\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "hutsegitea itxurapena agirira idazterakoan\n"
@@ -553,50 +558,50 @@ msgstr "SMTP erantzun gaitza\n"
 msgid "error occurred on SMTP session\n"
 msgstr "akatsa gertatu da SMTP saioan\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 ez eskuragarri\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 eskuragarri\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 ez eskuragarri\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 eskuragarri\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "SSL metodoa ez dago eskuragarri\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "SSL metodo ezezaguna *PROGRAMA AKATSA*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Akatsa ssl hitzingurua sortzerakoan\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL elkarketa %s erabiliz\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Zerbitzari egiaztagiria:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Gaia: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr " Jaulkitzailea: %s\n"
@@ -655,7 +660,7 @@ msgstr ""
 "horrela ez bada, idatzi hona: Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -692,14 +697,14 @@ msgstr ""
 "'G' zutabeko laukiak mezu berreskurapena gaitzeko 'Lortu denak' bidez."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Izena"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protokoloa"
 
@@ -827,13 +832,13 @@ msgstr "Ekintza erabiltzaile argumentoa"
 msgid "Add Address to Book"
 msgstr "Gehitu Helbidea Liburura"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Helbideak"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Bermarkak"
 
@@ -845,7 +850,7 @@ msgstr "Hautatu Helbide Liburu Agiritegia"
 msgid "Auto-registered address"
 msgstr "Berez-erregistraturiko helbidea"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Agiria"
@@ -866,10 +871,10 @@ msgstr "/_Agiria/_JPilot Berria"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Agiria/_LDAP Zerbitzari Berria"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Agiria/---"
@@ -886,21 +891,21 @@ msgstr "/_Agiria/E_zabatu"
 msgid "/_File/_Save"
 msgstr "/_Agiria/_Gorde"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Agiria/It_xi"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Editatu"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Editatu/_Kopiatu"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Editatu/_Itsatsi"
 
@@ -944,7 +949,7 @@ msgstr "/_Helbidea/_Editatu"
 msgid "/_Address/_Delete"
 msgstr "/_Helbidea/E_zabatu"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Tresnak"
@@ -957,12 +962,12 @@ msgstr "/_Tresnak/Inportatu _LDIF agiria"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Tresnak/Inportatu _CSV agiria"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Laguntza"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Laguntza/_Honi buruz"
@@ -980,7 +985,7 @@ msgid "/New _Folder"
 msgstr "/_Agiritegi Berria"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1022,7 +1027,7 @@ msgstr "Helbide liburua"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Agiritegia"
 
@@ -1034,17 +1039,17 @@ msgstr "Post@ helbidea"
 msgid "Search:"
 msgstr "Bilatu:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Hona:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Kik:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Kez:"
@@ -1254,7 +1259,7 @@ msgstr "Helbide arrunta"
 msgid "Personal address"
 msgstr "Norbanako helbidea"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Jakinarazpena"
 
@@ -1310,392 +1315,397 @@ msgstr "Marroia"
 msgid "None"
 msgstr "Ezer ez"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Ireki"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Gehitu..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Kendu"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Ezaugarriak..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Agira/_Bidali"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Agiria/Bi_dali geroago"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Agiria/_Gorde zirriborro agiritegian"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Agiria/Gorde eta _jarraitu editatzen"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Agiria/E_rantsi agiria"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Agiria/_Txertatu agiria"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Agiria/Txertatu _sinadura"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Agiria/Ge_hitu sinadura"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Editatu/_Desegin"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Editatu/_Berregin"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Editatu/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Editatu/_Ebaki"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editatu/Itsatsi _aipamen bezala"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Editatu/_Hautatu denak"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editatu/Inguratu _oraingo esaldia"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editatu/Inguratu _lerro luze guztiak"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editatu/Be_rez inguratzea"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Ikusi"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Ikusi/_Hona"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Ikusi/K_ik"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Ikusi/K_ez"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/_Ikusi/E_rantzun-Honi"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Ikusi/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/_Ikusi/_Jarraitu-Honi"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Ikusi/_Zuzenkaria"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Ikusi/Er_anskina"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ikusi/_Norbereratu tresnabarra..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Ikusi/Hizki-_kodeaketa"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Ikusi/Hizki-_kodeaketa/_Berezgaitasunez"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ikusi/Hizki-_kodeaketa/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ikusi/Hizki-kodeaketa/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ikusi/Hizki-kodeaketa/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Europa Mendebaldea (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Europa Mendebaldea (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Europa Erdialdea (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Baltikoa (ISO-8859-1_3)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/B_altikoa (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Ba_ltikoa (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/_Greziera (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Arabiera (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Arabiera (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Hebraiera (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Hebraiera (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Turkiera (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Zirilikoa (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Zirilikoa (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Zirilikoa (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Zirilikoa (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Japoniera (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Txinera Arrundua (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Txinera Arrundua (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Txinera Tradizionala (Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Koreaera (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Thailandiera (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ikusi/Hizki-_kodeaketa/Thailandiera (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Tresnak/_Helbide liburua"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Tresnak/E_redua"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Tresnak/E_kintzak"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Tresnak/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Tresnak/Editatu _kanpoko editatzailearekin"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Tresnak/Eskatu _jakinarazpen aukera"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Tresnak/PGP _Sinadura"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Tresnak/PGP _Enkriptaketa"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Tresnak/_Idaz-egiaztapena"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Tresnak/_Ezarri egiaztapen hizkuntza"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: agiria ez dago\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Ezin da idazki zatia lortzea\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Aipamen marka heuskarri akatsa."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Mezu erantzun/berbidaltze heuskarri akatsa."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s agiria ez dago\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ezin da %s-ren agiri neurria lortu\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "%s agiria hutsik dago."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Ezin da %s irakurri."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Mezua: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Ezinezkoa mezu zati-anitzaren zatia lortzea."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Gairik Gabe)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Osatu%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Sinadura"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Edukiontzia ez da adierazi."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Gaia hutsik"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Gaia hutsik dago. Bidali horrela ere?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Eranskina ez dago"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Ez dago eranskinik. Bidali eranskin gabe?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Egiaztatu edukiontziak"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Egitan bildali post@ hau hurrengo helbideei?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Hemendik:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Gaia:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "_Bidali"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
@@ -1703,11 +1713,11 @@ msgstr ""
 "Mezu berri egiaztapena ekinean dago orain.\n"
 "Mesedez saiatu berriro geroago."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "ezinezkoa edukiontzi zerrenda lortzea"
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1715,41 +1725,41 @@ msgstr ""
 "Posta bidaltzeko kontua ez da adierazi.\n"
 "Mesedez hautatu posta kontu bat bidali aurretik."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Akatsa gertatu da mezua %s-ra aurkezterakoan."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr "Mezu bidalketa osatu da, baina mezua ezin da irteera-kutxan gorde."
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Ezinezkoa aukitzea orain hautaturiko giltza id '%s'-rekin elkarturiko "
 "giltzarik."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "Ezin da mezua sinatu."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "Ezin da mezua enkriptatu."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "Ezin da enkriptatu edo sinatu mezua."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "ezin da agiri modua aldatu\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1760,11 +1770,11 @@ msgstr ""
 "\n"
 "Bidali hau %s bezala horrela ere?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Kode bihurketa akatsa"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1777,15 +1787,15 @@ msgstr ""
 "\n"
 "Bidali horrela ere?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Lerro luzera muga"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Enkriptaturik Kez-rekin"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1797,94 +1807,104 @@ msgstr ""
 "ikusgarriak izango dira enkriptaketa giltza zerrenda aztertzerakoan, "
 "ezkutukotasuna galduaraziz.\\nBidali horrela era?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "Ezin da mezu zaharra kendu\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "mezua lerrokatzen...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "ezin da lerro agiritegia aurkitu\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "ezin da mezua lerrokatu\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "%s agiria ez dago."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Ezin da %s agiria ireki."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Osaketa leihoa sortzen...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "PGP Sinadura"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "PGP Enkriptaketa"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Datu Mota"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Neurria"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Sinadura"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Sinadura egiaztatzen"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "MIME mota baliogabea."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Agiria ez dago edo hutsik dago."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Ezaugarriak"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME mota"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Kodeaketa"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Helburua"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Agiri izena"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "Agiria ez dago."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Agiri exekutagarria irekitzen"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1896,12 +1916,12 @@ msgstr ""
 "Abiaraztea nahi baduzu, gorde ezazu nonbait eta zihurtatu ez duela birusik "
 "edo programa maltzurren bat bezalakorik."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Kanpoko editatzaile agindu lerroa baliogabea da: `%s'\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1910,48 +1930,48 @@ msgstr ""
 "Kanpoko editatzailea oraindik lanean dago.\n"
 "Behartu prozesu amaiera (pid: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "_Norbereratu tresnabarra..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Ezin da mezua lerrokatu."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Hautatu agiriak"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Hautatu agiria"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Gorde mezua"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Mezu hau aldatu egin da. Zirriborro agiritegian gorde?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "It_xi gorde gabe"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Nahi duzu `%s'  eredua ezartzea?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Ezarri eredua"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Ordeztu"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Txertatu"
 
@@ -1992,7 +2012,7 @@ msgid "Nick Name"
 msgstr "Izenordea"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Post@ Helbidea"
 
@@ -2050,7 +2070,7 @@ msgid " Check File "
 msgstr " Egiaztatu Agiria"
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Agiria"
 
@@ -2058,62 +2078,62 @@ msgstr "Agiria"
 msgid "Add New Address Book"
 msgstr "Gehitu Helbide Liburu Berria"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Talde Izen bat eman behar da."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Editatu Talde Datuak"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Talde Izena"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Helbide Eskuragarriak"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Taldeko Helbideak"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mugitu Post@ Helbideak Taldetik edo Taldera gezi botoiekin"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Editatu Talde Xehetasunak"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Gehitu Talde Berria"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Editatu agiritegia"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Sartu agiritegiaren izen berria:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Agiritegi berria"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Sartu agiritegi berriaren izena:"
 
@@ -2130,7 +2150,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editatu JPilot Sarrera"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2195,7 +2215,7 @@ msgstr "Epemuga (seg)"
 msgid "Maximum Entries"
 msgstr "Gehinezko Sarrerak"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Ohinarrizkoa"
 
@@ -2283,7 +2303,7 @@ msgid "MH (number only)"
 msgstr "PK (zenbakia bakarrik)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr "Hautatu..."
 
@@ -2464,12 +2484,12 @@ msgstr "Agiritegi argibideak ezartzen...\n"
 msgid "Setting folder info..."
 msgstr "Agiritegi argibideak ezartzen..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Agiritegia mihatzen %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Agiritegia mihatzen %s ..."
@@ -3293,684 +3313,694 @@ msgstr ""
 "Itxurapenaren aurreko bertsioa aurkitu da.\n"
 "Hara aldatzea nahi duzu?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Agiria/_Agiritegia"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Agiria/_Agiritegia/_Sortu agiritegi berria..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Agiria/_Agiritegia/_Berrizendatu agiritegia..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Agiria/_Agiritegia/_Mugitu agiritegia..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Agiria/_Agiritegia/_Ezabatu agiritegia"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Agiria/_Postakutxa"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Agiria/_Postakutxa/_Gehitu postakutxa..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Agiria/_Postakutxa/_Kendu postakutxa"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Agiria/_Postakutxa/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Agiria/_Postakutxa/_Egiaztatu mezu berririk dagoen"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/_Agiria/_Postakutxa/Egiaztatu _mezu berririk dagoen postakutxa guztietan"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Agiria/_Postakutxa/_Berreraiki agiritegi zuhaitza"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_Agiria/_Inportatu posta datuak..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_Agiria/_Esportatu posta datuak..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Agiria/_Hustu zakarrontziko denak"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Agiria/_Gorde honela..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Agiria/_Orrialde ezarpena..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Agiria/Irar_kitu"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Agiria/_Lan egin lineaz-kanpo"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Agiria/I_rten"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Editatu/Ha_utatu haria"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editatu/Bilatu _oraingo mezuan..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Editatu/_Bilatu mezuak..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/_Editatu/Bilaketa _Azkarra"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Ikusi/_Erakutsi edo ezkutatu"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ikusi/_Erakutsi edo ezkutatu/_Agiritegi zuhaitza"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ikusi/_Erakutsi edo ezkutatu/_Mezu ikuspena"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ikusi/_Erakutsi edo ezkutatu/_Tresnabarra"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ikusi/_Erakutsi edo ezkutatu/_Tresnabarra/_Ikurra eta idazkia"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr ""
 "/_Ikusi/_Erakutsi edo ezkutatu/_Tresnabarra/I_dazkia ikurraren eskuinean"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ikusi/_Erakutsi edo ezkutatu/_Tresnabarra/I_kurra"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ikusi/_Erakutsi edo ezkutatu/_Tresnabarra/Id_azkia"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ikusi/_Erakutsi edo ezkutatu/_Tresnabarra/_Ezer ez"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Ikusi/_Erakutsi edo ezkutatu/_Bilaketa barra"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ikusi/_Erakutsi edo ezkutatu/_Egoera barra"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Ikusi/_Norbereratu tresnabarra..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/_Ikusi/_Antolakuntza"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Ikusi/_Antolakuntza/_Arrunta"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/_Ikusi/_Antolakuntza/_Zutika"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ikusi/Agiritegi _zuhaitz banandua"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Ikusi/_Mezu ikuspen banandua"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Ikusi/An_tolatu"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ikusi/_Antolatu/_zenbakiz"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ikusi/_Antolatu/_neurriz"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ikusi/_Antolatu/_egunez"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Ikusi/_Antolatu/_hari egunez"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ikusi/_Antolatu/he_mendik"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ikusi/_Antolatu/e_dukiontziz"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ikusi/_Antolatu/_gaiaz"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ikusi/_Antolatu/m_argo etiketaz"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ikusi/_Antolatu/ma_rkaz"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ikusi/_Antolatu/_irakurrigabe"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ikusi/_Antolatu/eran_skinez"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ikusi/_Antolatu/Ez an_tolatu"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Ikusi/_Antolatu/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ikusi/_Antolatu/G_orantz"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ikusi/_Antolatu/_Beherantz"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ikusi/_AnlotatuSort/Era_karri gaiz"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Ikusi/Hari ik_uspegia"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ikusi/_Hedatu hari guztiak"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ikusi/_Bildu hari guztiak"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Ikusi/Eza_rri erakuspen gaia..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Ikusi/_Joan hona"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ikusi/_Joan hona/A_urreko mezua"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ikusi/_Joan hona/_Hurrengo mezua"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Ikusi/_Joan hona/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ikusi/_Joan hona/_Aurreko mezu irakurrigabea"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ikusi/_Joan hona/Hu_rrengoo mezu irakurrigabea"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ikusi/_Joan hona/Aurre_ko mezu berria"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ikusi/_Joan hona/Hurreng_o mezu berria"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ikusi/_Joan hona/Aurreko _mezu markatua"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ikusi/_Joan hona/Hurrengo me_zu markatua"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ikusi/_Joan hona/Aurreko mezu e_tiketatua"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ikusi/_Joan hona/Hurrengo mezu eti_ketatua"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ikusi/_Joan hona/Be_ste agiritegi bat..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ikusi/Hikzi-_kodeaketa/_Berez atzeman"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ikusi/Hikzi-_kodeaketa/Europa Mendebaldea (_Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ikusi/Hikzi-_kodeaketa/Japoniera (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ikusi/Hikzi-_kodeaketa/Japoniera (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ikusi/Hikzi-_kodeaketa/Japoniera(_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ikusi/Hikzi-_kodeaketa/Txinera Tradizionala (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ikusi/Hikzi-_kodeaketa/Txinera (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ikusi/Hikzi-_kodeaketa/Koreaera (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Ikusi/_Ireki leiho berri batean/"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Ikusi/Mezu _iturburua"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/_Ikusi/I_dazburu guztiak"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Ikusi/Eguneratu _laburpena"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Mezua"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_Mezua/_Jaso"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mezua/_Jaso/Lortu _oraingo kontutik"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mezua/_Jaso/Lortu _kontu guztietatik"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Mezua/_Jaso/_Gelditu jasotzea"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Mezua/_Jaso/_Hurruneko postakutxa..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mezua/_Jaso/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mezua/Bidali _lerrokaturiko mezuak"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Mezua/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Mezua/_Osatu mezu berria"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Mezua/_Erantzun"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Mezua/Erantzun _honi"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mezua/Erantzun _honi/_denak"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mezua/Erantzun _honi/_bidaltzailea"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mezua/Erantzun _honi/_posta zerrenda"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Mezua/_Berbidali"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mezua/Berbidali era_nskin bezala"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Mezua/Berz_uzendu"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Mezua/_Mugitu..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Mezua/_Kopiatu..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Mezua/M_arkatu"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Mezua/_Markatu/_Ezarri ikurra"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Mezua/_Markatu/_Kendu ikurra"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Mezua/_Markatu/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mezua/_Markatu/_Markatu irakurrigabe bezala"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mezua/_Markatu/M_arkatu irakurrita bezala"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Mezua/_Markatu/Markatu _haria irakurrita bezala"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mezua/_Markatu/Markatu _denak irakurrita"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Mezua/E_zabatu"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mezua/Ezarri zabor_posta bezala"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mezua/Ezarri ez zaborpos_ta bezala"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Mezua/Ber-e_ditatu"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Tresnak/_Gehitu bidaltzailea helbide liburura..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Tresnak/_Iragazi agiritegiko mezu denak"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Tresnak/I_ragazi hautaturiko mezuak"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Tresnak/_Sortu iragazki araua"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Tresnak/_Sortu iragazki araua/_Berezgaitasunez"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Tresnak/_Sortu iragazki araua/_Hemendik"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Tresnak/_Sortu iragazki araua/H_ona"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Tresnak/_Sortu iragazki araua/_Gaia"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Tresnak/Iragazi agiritegiko _zaborpostak"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Tresnak/Iragazi ha_utaturiko mezuetako zaborpostak"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Tresnak/_Ezabatu bikoiztutako mezuak"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Tresnak/K_ateatu mezu bananduak"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Tresnak/E_xekutatu markatutako prozesua"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Tresnak/Iragazi agiritegiko _zaborpostak"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Tresnak/_Iragazi agiritegiko mezu denak"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Tresnak/_Ohar leihoa"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/It_xurapena"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/It_xurapena/_Hobespen arruntak..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/It_xurapena/_Iragazpen ezarpenak..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/It_xurapena/_Eredua..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/It_xurapena/E_kintzak..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/It_xurapena/_Plug-in kudeatzailea..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/It_xurapena/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/It_xurapena/_Oraingo kontuaren hobespenak..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/It_xurapena/_Sortu kontu berria..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/It_xurapena/E_ditatu kontuak..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/It_xurapena/_Aldatu oraingo kontua"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Laguntza/_Eskuliburua"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Laguntza/_Eskuliburua/_Ingelera"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Laguntza/_Eskuliburua/_Japoniera"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Laguntza/_SEG"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Laguntza/_SEG/_Ingelera"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Laguntza/_SEG/_Alemaniera"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Laguntza/_SEG/_Espainiera"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Laguntza/_SEG/_Frantziera"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Laguntza/_SEG/I_taliera"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Laguntza/_Agindu lerro aukerak"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Laguntza/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/_Laguntza/Egiaztatu eg_uneraketak..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/_Laguntza/Egiaztatu _plug-in eguneraketak..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Leiho nagusia sortzen...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Leiho-Nagusia: margo esleipen %d hutsegitea\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "eginda.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Izenburugabea"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "ezer ez"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Lineaz-kanpo"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Lineaz-kanpo zaude. Joan onlinera?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Hustu zakarrontzi osoa"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Ezabatu zakarrontzi agiritegietako mezu guztiak?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Gehitu postakutxa"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3980,16 +4010,16 @@ msgstr ""
 "Badagoen postakutxa bat adierazten bada,\n"
 "berezgaitasunez mihatuko da."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' postakutza jadanik badago."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Postakutxa"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3998,95 +4028,95 @@ msgstr ""
 "Hutsegitea postakutxa sortzerakoan.\n"
 "Badaiteke zenbait agiri jadanik egotea, edo ez duzu bertan idazteko baimenik."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Agiritegi Ikuspegia"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Mezu Ikuspegia"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Erantzun"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Erantzun _denei"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Erantzun _bidaltzaileari"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Erantzun _posta zerrendari"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Berbidali"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Berbidali era_nskin bezala"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Berz_uzendu"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "_Ikurra eta idazkia"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "I_dazki ikurraren eskuinean"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "_Ikurra"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_Idazkia"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_Ezer ez"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Lineaz-kanpo zaude. Klikatu ikurra onlinera joateko."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Online zaude. Klikatu ikurra linez-kanpora joateko"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Irten"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Irten programatik?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "Hautaturiko mezua ezin da nahastu."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Hautatu irekitzeko agiritegia"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Agindu lerro aukerak"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Erabilpena: sylpheed [AUKERA]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4120,7 +4150,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4154,15 +4184,15 @@ msgstr ""
 "erakutsi laguntza hau eta irten\n"
 "irteera bertsio argibideak eta irten"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Windows-bakarrik aukera:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport atakazbk"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "adierazi IPC hurreneko aginduentzako ataka"
 
@@ -4395,236 +4425,236 @@ msgstr "Agiria:"
 msgid "Description: "
 msgstr "Azalpena:"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Kontu hobespen leihoa irekitzen...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Kontua%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Kontu berriaren hobespenak"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Kontuaren hobespenak"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Kontuaren hobespen leihoa sortzen...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Jaso"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Bidali"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Osatu"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Pribatutasuna"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Proxya"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Kontu honen izena"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Ezarri berezko bezala"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Norbanako argibideak"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Izen osoa"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Post@ helbidea"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Erakundea"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Zerbitzari argibideak"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Berriak (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Ezer ez (tokikoa)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Zerbitzari honek egiaztapena behar du"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Berri zerbitzaria"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Jasotzeko zerbitzaria"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "SMTP zerbitzaria (bidali)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Erabiltzaile ID-a"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Sarhitza"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Erabili egiaztapen segurua (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Ezabatu mezuak zerbitzarian jasotakoan"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Kendu ondoren"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "egun"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 egun: kendu berehala"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Jeitsi mezu guztiak (jadanik jasotakoak barne) zerbitzarian"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Jasotze neurri muga"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Iragazi mezuak jasotzerakoan"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Berezko sarrera"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Iragazigabeko mezuak agiritegi honetan biltegiratuko dira."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Egiaztapen metodoa"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Berezgaitasunez"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Egiaztatu SARRERA jasotzerakoan bakarrik"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Iragazi mezu berriak SARRERAN jasotzerakoan"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Berriak"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Jeisteko idazlan zenbateko gehiena"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Mugagabe 0 adierazten bada."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Lortu denak' kontu honetan mezu berririk dagoen egiaztatzen du"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Idazburua"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Gehitu Egun idazburu eremua"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Sortu Mezu-ID-a"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Gehitu erabiltzaileak-zehazturiko idazburua"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr "Editatu..."
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Egiaztapena"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Egiaztapena (SMTP EGIAZT)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4632,240 +4662,244 @@ msgstr ""
 "Sarrera hauek hutsik uzten badituzu, jasotze erabiltzaile ID eta sarhitz "
 "berdina erabiliko da."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Egiaztatu POP3-rekin bidali aurretik"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Sinadura"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Zuzeneko sarrera"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Izena:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Agindu irteera"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Jarri sinadura aipamenaren aurretik (ez da gomendagarria)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Berezgaitasunez ezarri hurrengo helbideak"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Kik"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Kez"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Erantzun-Honi"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "PGP sinadura mezua berez"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "PGP enkriptaketa mezua berez"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Enkriptatu mezu enkriptatuari erantzuterakoan"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 msgid "Add my own key to the recipients list on encryption"
 msgstr "Gehitu neure giltza edukiontzi zerrendara enkriptatzerakoan"
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Erabili ASCII-blindatua heuskarria enkriptaketarako"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Erabili idazki garbi sinadura"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr "Sinadura / Enkriptaketa giltza"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Erabili berezko GnuPG giltza"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Hautatu zure post@ helbidearentzako giltza"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Adierazi giltza eskuz"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Erabiltzaile edo giltza ID-a:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Ez erabili SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Erabili SSL POP3 elkarketarako"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Erabili STARTTLS agindua SSL saioa hasteko"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Erabili SSL IMAP4 elkarketarako"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Erabili SSL NNTP elkarketarako"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Bidali (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Erabili SSL SMTP elkarketarako"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Erabili blokeo-gabeko SSL"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Ezgaitu hau arazoak badituzu SSL elkarketan."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "Erabili SOCKS proxya"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Hostalari-izena:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Ataka:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Erabili egiaztapena"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Izena:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Sarhitza:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Erabili SOCKS proxya bidaltzerakoan"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Adierazi SMTP ataka"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Adierazi PPO3 ataka"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Adierazi IMAP4 ataka"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Adierazi NNTP ataka"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Adierazi domeinu izena"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP zerbitzari zuzenbidea"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Zuzenbide honetako azpiagiritegiak bakarrik erakutsiko dira."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Garbitu mezu guztien katxea irtetzerakoan"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Jarri bidalitako mezuak hemen"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Jarri zakarrontzi mezuak hemen"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Jarri lerrokatutako mezuak hemen"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Jarri ezabatutako mezuak hemen"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Kontu izena ez da sartu."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Posta helbidea ez da sartu."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "SMTP zerbitzaria ez da sartu."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Erabiltzaile ID-a ez da sartu."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "POP3 zerbitzaria ez da sartu."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 zerbitzaria ez da sartu."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "NNTP zerbitzaria ez da sartu."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Adierazitako agiritegia ez da lerro agiritegi bat."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/fi.po b/po/fi.po
index 1a95cf21..20ccbe29 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2011-03-07 23:37+0200\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <foo@bar.example>\n"
@@ -28,202 +28,207 @@ msgstr "Roskapostisuodatus (käsin)"
 msgid "Junk mail filter"
 msgstr "Roskapostikansio"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-yhteys palvelimeen %s on katkaistu. Yhdistetään uudelleen...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP-palvelin estää LOGINin.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "IMAP-yhteyttä ei voitu muodostaa.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "luodaan IMAP4-yhteyttä palvelimeen %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "TLS-istuntoa ei voida käynnistää.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "Noudetaan viestiä %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Lisätään viestejä kohteeseen %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Siirretään viestejä %s -> %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopioidaan viestejä %s -> %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Poistetaan viestejä: %s..."
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ei voida merkitä poistetuksi: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "ei voida poistaa lopullisesti\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Poistetaan kaikki viestit kohteesta %s..."
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ei voida merkitä poistetuksi: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "kansiota ei voida sulkea\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "juurikansiota %s ei ole olemassa\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "sattui virhe noudettaessa LISTiä.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ei voida luoda: ”%s”\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOXin alle ei voida luoda kohdetta ”%s”\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "postilaatikkoa ei voi luoda: LIST epäonnistui\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "postilaatikkoa ei voida luoda\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "postilaatikkoa ei voida luoda\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "postilaatikon %s nimeksi ei voi muuttaa %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "postilaatikkoa ei voida poistaa\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Noudetaan viestiotsakkeita (%d / %d bytes)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr ""
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr ""
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr ""
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4-palvelinyhteyttä ei saatu: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4-istuntoa ei saada muodostetuksi palvelimeen: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "nimiavaruutta ei saada luetuksi...\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kansiota ei voi valita: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "virhe IMAP-komennossa: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-tunnistautuminen epäonnistui.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-kirjautuminen epäonnistui.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ei voi lisätä %s kohteeseen %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(lähetetään tiedostoa...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "viestiä ei voi lisätä kohteeseen %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ei voi kopioida %s -> %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "virhe IMAP-komennon aikana: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "virhe IMAP-komennon aikana: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "virhe IMAP-komennon aikana: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ei osaa muuntaa UTF-7 ->%s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei osaa muuntaa %s -> UTF-7\n"
@@ -495,7 +500,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "POP3-istunnossa sattui virhe\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "asetusten kirjoittaminen tiedostoon epäonnistui\n"
@@ -547,50 +552,50 @@ msgstr "kelvoton SMTP-vastaus\n"
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP-istunnossa sattui virhe\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 ei ole käytettävissä\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 on käytettävissä\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 ei ole käytettävissä\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 on käytettävissä\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "SSL-menetelmä ei ole käytettävissä\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Tuntematon SSL-menetelmä, *OHJELMAVIRHE*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Virhe luotaessa SSL-kontekstia\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL-yhteys käyttäen %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Palvelimen varmenne:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Aihe: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Julkaisija: %s\n"
@@ -635,7 +640,7 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -672,14 +677,14 @@ msgstr ""
 "jos haluat viestit haettavan ”Nouda kaikki” -toiminnolla."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Nimi"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Yhteyskäytäntö"
 
@@ -806,13 +811,13 @@ msgstr "Toiminnon käyttäjäparametri"
 msgid "Add Address to Book"
 msgstr "Lisää osoite osoitekirjaan"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Osoite"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Huomautukset"
 
@@ -824,7 +829,7 @@ msgstr "Valitse osoitekirjan kansio"
 msgid "Auto-registered address"
 msgstr "Poista osoitteet"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Tiedosto"
@@ -845,10 +850,10 @@ msgstr "/_Tiedosto/Uusi _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Tiedosto/Uusi L_DAP-palvelin"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Tiedosto/---"
@@ -865,21 +870,21 @@ msgstr "/_Tiedosto/_Poista"
 msgid "/_File/_Save"
 msgstr "/_Tiedosto/_Tallenna"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Tiedosto/_Sulje"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Muokkaa"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Muokkaa/_Kopioi"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Muokkaa/L_iitä"
 
@@ -923,7 +928,7 @@ msgstr "/_Osoite/_Muokkaa"
 msgid "/_Address/_Delete"
 msgstr "/_Osoite/_Poista"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/T_yökalut"
@@ -936,12 +941,12 @@ msgstr "/T_yökalut/Tuo _LDIF-tiedosto"
 msgid "/_Tools/Import _CSV file"
 msgstr "/T_yökalut/Tuo _CSV-tiedosto"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Ohje"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Ohje/_Tietoja ohjelmasta"
@@ -959,7 +964,7 @@ msgid "/New _Folder"
 msgstr "/Uusi _kansio"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1001,7 +1006,7 @@ msgstr "Osoitekirja"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Kansio"
 
@@ -1013,17 +1018,17 @@ msgstr "Sähköpostiosoite"
 msgid "Search:"
 msgstr "Etsi:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Kopionsaaja:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Piilokopionsaaja:"
@@ -1227,7 +1232,7 @@ msgstr "Yleinen osoite"
 msgid "Personal address"
 msgstr "Oma osoite"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Huomautus"
 
@@ -1283,403 +1288,408 @@ msgstr "Ruskea"
 msgid "None"
 msgstr "Ei mitään"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Avaa"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/L_isää..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Poista"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Ominaisuudet..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Tiedosto/L_ähetä"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Tiedosto/Lähetä m_yöhemmin"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Tiedosto/_Tallenna luonnoskansioon"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Tiedosto/Tallenna _ja jatka muokkausta"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Tiedosto/L_iitä tiedosto"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Tiedosto/L_isää tiedosto"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Tiedosto/Lisää _allekirjoitus"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Tiedosto/Lisää _allekirjoitus"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Muokkaa/Per_u"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Muokkaa/_Tee uudelleen"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Muokkaa/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Muokkaa/_Leikkaa"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Muokkaa/Liitä l_ainauksena"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Muokkaa/Valitse _kaikki"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Muokkaa/Rivitä nykyinen ka_ppale"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Muokkaa/Rivitä _pitkät rivit"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Muokkaa/_Rivitä"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Näkymä"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Näkymä/Vastaan_ottaja"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Näkymä/K_opionsaaja"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Näkymä/P_iilokopionsaaja"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/_Näkymä/Vastaus_osoite"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Näkymä/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/_Näkymä/Aseta _seurantaryhmä"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Näkymä/_Viivain"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Näkymä/L_iite"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Näkymä/_Mukauta työkaluriviä..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Näkymä/_Merkistökoodaus"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Näkymä/_Merkistökoodaus/_Automaattinen"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Näkymä/_Merkistökoodaus/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Näkymä/_Merkistökoodaus/7-bittinen ASCII (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Näkymä/_Merkistökoodaus/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Näkymä/_Merkistökoodaus/Länsieurooppalainen (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Näkymä/_Merkistökoodaus/Länsieurooppalainen (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Näkymä/_Merkistökoodaus/Keskieurooppalainen (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Näkymä/_Merkistökoodaus/_Balttilainen (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Näkymä/_Merkistökoodaus/Balttilainen (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Näkymä/_Merkistökoodaus/Balttilainen (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Näkymä/_Merkistökoodaus/Kreikkalainen (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Näkymä/_Merkistökoodaus/Arabialainen (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Näkymä/_Merkistökoodaus/Arabialainen (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Näkymä/_Merkistökoodaus/Heprealainen (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Näkymä/_Merkistökoodaus/Heprealainen (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Näkymä/_Merkistökoodaus/Turkkilainen (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Näkymä/_Merkistökoodaus/Kyrillinen (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Näkymä/_Merkistökoodaus/Kyrillinen (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Näkymä/_Merkistökoodaus/Kyrillinen (KOI8-_U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Näkymä/_Merkistökoodaus/Kyrillinen (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Näkymä/_Merkistökoodaus/Japanilainen (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Näkymä/_Merkistökoodaus/Yksinkertaistettu kiinalainen (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Näkymä/_Merkistökoodaus/Yksinkertaistettu kiinalainen (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Näkymä/_Merkistökoodaus/Perinteinen kiinalainen (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Näkymä/_Merkistökoodaus/Korealainen (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Näkymä/_Merkistökoodaus/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Näkymä/_Merkistökoodaus/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/T_yökalut/_Osoitekirja"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/T_yökalut/_Aihio"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/T_yökalut/_Toiminnot"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/T_yökalut/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/T_yökalut/Muokkaa _ulkoisessa muokkaimessa"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/T_yökalut/PGP-_allekirjoita"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/T_yökalut/PGP-_salaa"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/T_yökalute/O_ikoluku"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/T_yökalut/Aseta oikoluku_kieli"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: tiedostoa ei ole olemassa\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Tekstin osaa ei saada noudetuksi\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Lainausmerkinnän muotovirhe."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Vastaus- tai välitysviestin muotovirhe."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Tiedostoa %s ei ole olemassa\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Tiedoston %s kokoa ei saada selville\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Tiedosto %s on tyhjä."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Kohdetta %s ei voi lukea."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Viesti: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Moniosaisen viestin osaa ei saa noudetuksi."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Ei aihetta)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s – Kirjoita%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Allekirjoitus"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Vastaanottajaa ei ole annettu."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Tyhjä aihe"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Aihetta ei ole asetettu. Lähetetäänkä silti?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Liite puuttuu"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Liitettä ei ole. Lähetetäänkö liitteittä?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Tarkista vastaanottajat"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Lähetetäänkö viesti todella seuraaviin osoitteisiin?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Lähettäjä:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr " Lähetä "
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Tarkistetaan kaikkien kansioiden uusia viestejä..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "vastaanottajaluetteloa ei saa noudetuksi."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1687,39 +1697,39 @@ msgstr ""
 "Lähtevää sähköpostitiliä ei ole määritetty.\n"
 "Valitse tili ennen lähettämistä."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Sattui virhe lähetettäessä viestiä vastaanottajalle %s ."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Valittuun avaintunnisteeseen ”%s” yhdistettyä avainta ei löytynyt."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "Viestiä ei voi asettaa jonoon."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "Viestiä ei voi asettaa jonoon."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "Viestiä ei voi salata tai allekirjoittaa."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "tiedoston tilaa ei voi muuttaa\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1730,11 +1740,11 @@ msgstr ""
 "\n"
 "Lähetetäänkö muodossa %s?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Koodinmuunnosvirhe"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1747,15 +1757,15 @@ msgstr ""
 "\n"
 "Lähetetäänkö silti?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Rivin pituusrajoitus"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Piilokopion salaus"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1769,94 +1779,104 @@ msgstr ""
 "\n"
 "Lähetetäänkö silti?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "vanhaa viestiä ei voida poistaa\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "viedään viestiä jonoon...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "jonotuskansiota ei löydy\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "viestiä ei voida viedä jonoon\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Tiedostoa %s ei ole olemassa."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Tiedostoa %s ei voi avata."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Luodaan viestinkirjoitusikkunaa...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "PGP-allekirjoita"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "PGP-salaa"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Datatyyppi"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Koko"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Allekirjoitus"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Tarkistetaan allekirjoitusta"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Kelvoton MIME-tyyppi"
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Tiedostoa ei ole olemassa tai se on tyhjä."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME-tyyppi"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Polku"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Tiedostonimi"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "Ehtoa ei ole olemassa."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Avataan ulkoista ohjelmaa"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1868,12 +1888,12 @@ msgstr ""
 "Jos haluat käynnistää ohjelman, tallenna tiedosto jonnekin ja varmista, "
 "ettei se sisällä viruksia tai ole muuten pahantahtoinen."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ulkoisen muokkaimen komentorivillä on virhe: '%s'\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1882,48 +1902,48 @@ msgstr ""
 "Ulkoinen muokkain on yhä käynnissä.\n"
 "Pakotetaanko lopettamaan prosessi (PID: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "_Mukauta työkaluriviä"
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Viestiä ei voi asettaa jonoon."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Valitse tiedostot"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Valitse tiedosto"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Tallenna viesti"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Viestiä on muokattu. Tallennetaanko se luonnoskansioon?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Sulje _tallentamatta"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Haluatko varmasti käyttää aihiota ”%s”?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Käytä aihiota"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "K_orvaa"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Lisää"
 
@@ -1964,7 +1984,7 @@ msgid "Nick Name"
 msgstr "Kutsumanimi"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
@@ -2022,7 +2042,7 @@ msgid " Check File "
 msgstr " Tarkista tiedosto "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Tiedosto"
 
@@ -2030,62 +2050,62 @@ msgstr "Tiedosto"
 msgid "Add New Address Book"
 msgstr "Lisää uusi osoitekirja"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Ryhmän nimi on annettava."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Muokkaa ryhmätietoja"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Ryhmän nimi"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Saatavilla olevat osoitteet"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Ryhmän osoitteet"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Siirrä sähköpostiosoitteita ryhmään tai ryhmästä nuolinäppäimin"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Muokkaa ryhmän yksityiskohtia"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Lisää uusi ryhmä"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Muokkaa kansiota"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Anna kansion uusi nimi:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Uusi kansio"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Uuden kansion nimi:"
 
@@ -2102,7 +2122,7 @@ msgid "Edit JPilot Entry"
 msgstr "/_Tiedosto/Uusi _JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2167,7 +2187,7 @@ msgstr "Aikakatkaisu (s)"
 msgid "Maximum Entries"
 msgstr "Tietueita enintään"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Perusasetukset"
 
@@ -2253,7 +2273,7 @@ msgid "MH (number only)"
 msgstr "MH (vain numero)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Valitse... "
 
@@ -2437,12 +2457,12 @@ msgstr "Asetetaan kansion tietoja...\n"
 msgid "Setting folder info..."
 msgstr "Asetetaan kansion tietoja..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tutkitaan kansiota %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tutkitaan kansiota %s ..."
@@ -3267,684 +3287,694 @@ msgstr ""
 "Asetuksista löytyi varhaisempi versio.\n"
 "Haluatko siirtää ne?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Tiedosto/_Kansio"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Tiedosto/_Kansio/Luo _uusi kansio..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Tiedosto/_Kansio/Muuta kansion _nimeä..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Tiedosto/_Kansio/_Siirrä kansio..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Tiedosto/_Kansio/_Poista kansio"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Tiedosto/_Postilaatikko"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Tiedosto/_Postilaatikko/L_isää postilaatikko..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Tiedosto/_Postilaatikko/_Poista postilaatikko"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Tiedosto/_Postilaatikko/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Tiedosto/_Postilaatikko/_Tarkista uudet viestit"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/_Tiedosto/_Postilaatikko/Tarkista kaikkien _postilaatikoiden uusi posti"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Tiedosto/_Postilaatikko/_Rakenna kansiopuu uudelleen"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_Tiedosto/T_uo postit..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_Tiedosto/_Vie postit..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Tiedosto/Tyhjennä _roskakorit"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Tiedosto/Tallenna _nimellä..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Tiedosto/_Sivun asetukset..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Tiedosto/Tul_osta..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Tiedosto/T_yöskentele verkotta"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Tiedosto/_Lopeta"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Muokkaa/Valitse _säie"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Muokkaa/_Etsi nykyisestä viestistä..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Muokkaa/Etsi _viestejä..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/_Muokkaa/Pika_haku"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Näkymä/_Näytä tai piilota"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Näkymä/_Näytä tai piilota/_Kansiopuu"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Näkymä/_Näytä tai piilota/_Viestinäkymä"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Näkymä/_Näytä tai piilota/T_yökalurivi"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Näkymä/_Näytä tai piilota/T_yökalurivi/Kuvake _ja teksti"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr ""
 "/_Näkymä/_Näytä tai piilota/T_yökalurivi/Teksti kuvakkeen _oikealla puolen"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Näkymä/_Näytä tai piilota/T_yökalurivi/_Kuvake"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Näkymä/_Näytä tai piilota/T_yökalurivi/_Teksti"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Näkymä/_Näytä tai piilota/T_yökalurivi/_Ei mitään"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Näkymä/_Näytä tai piilota/_Hakurivi"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Näkymä/_Näytä tai piilota/_Tilarivi"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Näkymä/_Mukauta työkaluriviä..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/_Näkymä/_Asettelu"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Näkymä/_Asettelu/_Tavallinen"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/_Näkymä/_Asettelu/_Pysty"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Näkymä/Erota _kansiopuu"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Näkymä/_Erota viestinäkymä"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Näkymä/La_jittele"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Näkymä/La_jittele/N_umeroittain"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Näkymä/_Lajittele/K_oon mukaan"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Näkymä/La_jittele/_Päiväyksittäin"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Näkymä/_Lajittele/_Säikeen päiväyksen mukaan"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Näkymä/La_jittele/_Lähettäjittäin"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Näkymä/La_jittele/_Vastaanottajittain"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Näkymä/La_jittele/_Aiheittain"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Näkymä/La_jittele/V_ärikoodeittain"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Näkymä/La_jittele/Merkinnän m_ukaan"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Näkymä/La_jittele/_Luettuuden mukaan"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Näkymä/_Lajittele/Liittei_den mukaan"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Näkymä/La_jittele/_Älä lajittele"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Näkymä/La_jittele/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Näkymä/La_jittele/Nouseva (tavallinen)"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Näkymä/La_jittele/Laskeva (käänteinen)"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Näkymä/La_jittele/K_okoa aiheittain"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Näkymä/_Säienäkymä"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Näkymä/A_vaa kaikki säikeet"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Näkymä/S_ulje kaikki säikeet"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Näkymä/_Aseta näytettävät sarakkeet..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Näkymä/_Siirry"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Näkymä/_Siirry/Edell_inen viesti"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Näkymä/_Siirry/Seuraa_va viesti"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Näkymä/_Siirry/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Näkymä/_Siirry/_Edellinen lukematon viesti"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Näkymä/_Siirry/Seuraava lukemat_on viesti"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Näkymä/_Siirry/Ede_llinen uusi viesti"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Näkymä/_Siirry/Seuraava _uusi viesti"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Näkymä/_Siirry/E_dellinen merkitty viesti"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Näkymä/_Siirry/Seuraava _merkitty viesti"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Näkymä/_Siirry/Edellinen v_ärikoodattu viesti"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Näkymä/_Siirry/Seuraava vä_rikoodattu viesti"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Näkymä/_Siirry/Toinen kansio..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Näkymä/_Merkistökoodaus/_Automaattitunnistus"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Näkymä/_Merkistökoodaus/Länsieurooppalainen (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Näkymä/_Merkistökoodaus/Japanilainen (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Näkymä/_Merkistökoodaus/Japanilainen (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Näkymä/_Merkistökoodaus/Japanilainen (_Shift_JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Näkymä/_Merkistökoodaus/Perinteinen kiinalainen (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Näkymä/_Merkistökoodaus/Kiinalainen (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Näkymä/_Merkistökoodaus/Korealainen (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Näkymä/Avaa uuteen _ikkunaan"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Näkymä/Viestin lähdekoo_di"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/_Näkymä/K_aikki otsakkeet"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Näkymä/Päi_vitä yhteenveto"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/V_iesti"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/V_iesti/Va_staanota"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/V_iesti/Va_staanota/Nouda n_ykyiseltä tililtä"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/V_iesti/Empfang/Nouda _kaikilta tileiltä"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/V_iesti/Va_staanota/_Lopeta vastaanotto"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/V_iesti/Va_staanota/_Lopeta vastaanotto"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/V_iesti/Va_staanota/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/V_iesti/Lähetä _jonossa olevat viestit"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/V_iesti/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/V_iesti/Kirjoita _uusi viesti"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/V_iesti/V_astaa"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/V_iesti/V_astaa..."
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/V_iesti/V_astaa.../K_aikille"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/V_iesti/V_astaa.../_Lähettäjälle"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/V_iesti/V_astaa.../_Postilistalle"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/V_iesti/_Välitä"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/V_iesti/Välitä l_iitteenä"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/V_iesti/Ohjaa _uudelleen"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/V_iesti/_Siirrä..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/V_iesti/_Kopioi..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/V_iesti/_Merkitse"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/V_iesti/_Merkitse/Merkitse k_aikki luetuiksi"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/V_iesti/_Merkitse/Merkitse k_aikki luetuiksi"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/V_iesti/_Merkitse/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/V_iesti/_Merkitse/Merkitse lukematt_omaksi"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/V_iesti/_Merkitse/Merkitse _luetuksi"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/V_iesti/_Merkitse/Merkitse _säie luetuksi"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/V_iesti/_Merkitse/Merkitse k_aikki luetuiksi"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/V_iesti/_Poista"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/V_iesti/Merkitse _roskapostiksi"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/V_iesti/Merkitse _ei-roskapostiksi"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/V_iesti/_Muokkaa uudelleen"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/T_yökalut/Lisää lähettäjä _osoitekirjaan..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/T_yökalut/Suodata kansion kaikki viestit"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/T_yökalut/Suodata _valitut viestit"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/T_yökalut/Luo _suodatussääntö"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/T_yökalut/Luo _suodatussääntö/_Automaattisesti"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/T_yökalut/Luo _suodatussääntö/_Lähettäjästä"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/T_yökalut/Luo _suodatussääntö/_Vastaanottajasta"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/T_yökalut/Luo _suodatussääntö/_Aiheesta"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/T_yökalut/Suodata kansion _roskapostit"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/T_yökalut/S_uodata roskapostit valituista viesteistä"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/T_yökalut/P_oista toistuvat samat viestit"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/T_yökalut/_Yhdistä erotetut viestit"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/T_yökalut/_Suorita merkitty prosessi"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/T_yökalut/Suodata kansion _roskapostit"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/T_yökalut/Suodata kansion kaikki viestit"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/T_yökalut/L_oki-ikkuna"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Asetukset"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Asetukset/_Yleisasetukset..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Asetukset/_Suodatusasetukset..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Asetukset/_Aihiot..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Asetukset/_Toiminnot..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Asetukset/Liitännäisten _hallinta..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Asetukset/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Asetukset/_Nykyisen tilin asetukset..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Asetukset/_Luo uusi tili..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Asetukset/_Muokkaa tilejä..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Asetukset/_Muuta nykyistä tiliä..."
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Ohje/_Käsikirja"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ohje/_Käsikirja/_Englanniksi"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ohje/_Käsikirja/_Japaniksi"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Ohje/_UKK"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ohje/_UKK/_Englanniksi"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ohje/_UKK/_Saksaksi"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ohje/_UKK/_Espanjaksi"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ohje/_UKK/_Ranskaksi"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ohje/_UKK/_Italiaksi"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Ohje/_Komentorivivalitsimet"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Ohje/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/_Ohje/_Tarkista päivitykset..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/_Ohje/Tarkista _liitännäisten päivitykset..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Luodaan pääikkunaa...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Pääikkuna: värin osoitus %d epäonnistui\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "valmis.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Nimetön"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "ei mitään"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Ei verkossa"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Yhteyttä ei ole. Otetaanko yhteys?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Tyhjennä kaikki roskakorit"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Poistetaanko kaikki viestit roskakoreista?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Lisää postilaatikko"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3954,16 +3984,16 @@ msgstr ""
 "Jos postilaatikko on jo olemassa, sen sisältö\n"
 "tarkastetaan automaattisesti."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Postilaatikko ”%s” on jo olemassa."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Postilaatikko"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3973,95 +4003,95 @@ msgstr ""
 "Joitakin tiedostoja voi olla jo olemassa tai sinulla ei ole "
 "kirjoitusoikeuksia kansioon."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed – Kansionäkymä"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed – Viestinäkymä"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/V_astaa"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Vastaa _kaikille"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Vastaa _lähettäjälle"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Vastaa _postilistalle"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Välitä"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Välitä l_iitteenä"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Ohjaa _uudelleen"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Kuvake _ja teksti"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Teksti kuvakkeen _oikealla puolen"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "_Kuvake"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_Teksti"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_Ei mitään"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Yhteyttä ei ole. Ota yhteys napsauttamalla kuvaketta."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Olet verkossa. Katkaise yhteys napsauttamalla kuvaketta."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Lopeta"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Lopetetaanko ohjelma?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "Seuraavia viestejä ei voitu yhdistää."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Valitse avattava kansio"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Komentorivivalitsimet"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Käyttö: sylpheed [VALITSIN]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4094,7 +4124,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4126,15 +4156,15 @@ msgstr ""
 "näytä tämä ohje ja lopeta\n"
 "näytä versiotiedot ja lopeta"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Windows-kohtainen valitsin:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport porttino"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "määritä IPC-etäkomentojen portti"
 
@@ -4369,236 +4399,236 @@ msgstr "Tiedosto: "
 msgid "Description: "
 msgstr "Kuvaus: "
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Avataan tilinasetusikkuna...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Tili%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Uuden tilin asetukset"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Tilin asetukset"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Luodaan tilinasetusikkunaa...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Vastaanotto"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Lähetys"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Viestien kirjoitus"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Välityspalvelin"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Tämän tilin nimi"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Aseta oletukseksi"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Omat tiedot"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Koko nimi"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Sähköpostiosoite"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Palvelimen tiedot"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Keskusteluryhmät (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Ei mitään (paikallinen)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Palvelin vaatii tunnistautumaan"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Keskusteluryhmäpalvelin"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Vastaanottava palvelin"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "SMTP-palvelin (lähetys)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Käyttäjätunnus"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Salasana"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Käytä salattua tunnistautumista (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Poista vastaanotetut viestit palvelimelta"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Poista ajassa"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "päivä(ä)"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 päivää: poista heti"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Lataa kaikki viestit (myös jo noudetut) palvelimelta"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Vastaanoton kokorajoitus"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "kt"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Suodata viestit vastaanotettaessa"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Oletuspostilaatikko"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Suodattamattomat viestit tallennetaan tähän kansioon."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Tunnistautumistapa"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Tarkista tulevien kansio vain vastaanotettaessa"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Suodata INBOXin uudet viestit vastaanotettaessa"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Keskusteluryhmät"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Ladattavien artikkelien enimmäismäärä"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Ei rajoitusta, jos asetetaan 0:ksi."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "”Nouda kaikki” tarkistaa tämän tilin uudet viestit"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Otsake"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Lisää otsakkeisiin päiväyskenttä"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Luo viestin tunniste"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Lisää käyttäjän määrittelemä otsake"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Muokkaa... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Tunnistautuminen"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-tunnistautuminen (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4606,241 +4636,245 @@ msgstr ""
 "Jos jätät nämä kohdat tyhjiksi, käytetään samaa käyttäjätunnusta ja "
 "salasanaa kuin vastaanotettaessa."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Tunnistaudu POP3:een ennen lähettämistä"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Allekirjoitus"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Suorasyöttö"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Nimi:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Komennon tuloste"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Sijoita allekirjoituksen lainauksen edelle (ei suositella)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Aseta automaattisesti seuraavat osoitteet"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Kopionsaaja"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Piilokopionsaaja"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Vastausosoite"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "PGP-allekirjoita viesti oletusarvoisesti"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "PGP-salaa viesti oletusarvoisesti"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Salaa vastattaessa salattuun viestiin"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "vastaanottajaluetteloa ei saa noudetuksi."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Käytä ASCII-muotoa salaukseen"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Käytä ASCII-muotoa GnuPG-allekirjoituksiin"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Käytä oletus-GnuPG-avainta"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Valitse sähköpostiosoitteesi avain"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Syötä avain käsin"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Käyttäjän tai avaimen tunniste:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Älä käytä SSL:ää"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Käytä SSL:ää POP3-yhteyksissä"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Käynnistä SSL-istunto STARTTLS-komennolla"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Käytä SSL:ää IMAP4-yhteyksissä"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Käytä SSL:ää NNTP-yhteyksissä"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Lähetä (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Käytä SSL:ää SMTP-yhteyksissä"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Poista tämä käytöstä, jos SSL-yhteydessä on ongelmia."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "Käytä SOCKS-välityspalvelinta"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Palvelinnimi:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Portti:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Käytä tunnistautumista"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Nimi:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Käytä SOCKS-välityspalvelinta lähetettäessä"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Määritä SMTP-portti"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Määritä POP3-portti"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Määritä IMAP4-portti"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Määritä NNTP-portti"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Määritä aluenimi"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP-palvelinkansio."
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Vain tämän kansion alikansiot näytetään."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Tyhjennä kaikki viestivälimuistit lopetettaessa"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Siirrä lähetetyt viestit kansioon"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Siirrä luonnokset kansioon"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Siirrä jonossa olevat viestit kansioon"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Siirrä poistetut viestit kansioon"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Tilille ei ole annettu nimeä."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Sähköpostiosoitetta ei ole annettu."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "SMTP-palvelinta ei ole annettu."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Käyttäjätunnistetta ei annettu."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "POP3-palvelinta ei ole annettu."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-palvelinta ei ole annettu."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "NNTP-palvelinta ei ole annettu."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Määritettyä kansiota ei ole jonokansiossa."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/fr.po b/po/fr.po
index a23484cd..4e03f6f9 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: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2015-11-27 11:53+0100\n"
 "Last-Translator: \n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -36,202 +36,207 @@ msgstr "Tri (manuel) des indésirables"
 msgid "Junk mail filter"
 msgstr "Dossier des messages indésirables"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexion IMAP4 vers %s a été interrompue. Reconnexion...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Le serveur IMAP4 désactive LOGIN.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "Impossible d'établir un session IMAP.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "création de la connexion IMAP4 vers %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Impossible d'initier la session TLS.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(Récupération MARQUAGES...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "Réception du message %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Ajout des messages à %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Déplacement des messages de %s vers %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copie des messages de %s vers %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Effacement des messages %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "impossible de marquer pour la suppression : %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "impossible de purger\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Effacement de tous les messages dans %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "impossible de marquer pour la suppression : 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "impossible de fermer le dossier\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "le dossier racine %s n'existe pas\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "Une erreur est survenue lors de la réception de LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Impossible de créer « %s »\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Impossible de créer « %s » sous Réception \n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "impossible de créer la boîte aux lettres\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "impossible de créer la boîte aux lettres\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossible de renomer la boîte aux lettres %s en %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "impossible de supprimer la boîte aux lettres\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Réception des en-têtes de message (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "erreur lors de la lecture de l'enveloppe.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "impossible d'analyser l'enveloppe : %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "Impossible de faire une enveloppe\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur IMAP4 : %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Impossible d'établir une session IMAP4 avec : %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "Impossible d'obtenir l'espace nom\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "erreur avec la commande IMAP : STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "L'authentification IMAP4 a échoué.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Échec au login IMAP4.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "Impossible de d'ajouter %s à %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(envoi du fichier...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossible d'ajouter le message à %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossible de copier %s vers %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erreur avec la commande IMAP : STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erreur lors de la commande IMAP : EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "erreur avec la commande IMAP : CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne peut convertir de UTF-7 vers %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut convertir de %s vers UTF-7\n"
@@ -510,7 +515,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "une erreur est survenue pendant la session POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "Échec d'écriture de la configuration dans le fichier\n"
@@ -563,50 +568,50 @@ msgstr "mauvaise réponse SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "Une erreur est survenue pendant la session SMTP\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 absent\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 disponible\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 absent\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 disponible\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "Méthode SSL non disponible\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Méthode SSL inconnue *BUG DU PROGRAMME*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Erreur lors de la création du contexte SSL\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Connexion SSL utilisant %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Serveur de certificat :\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Sujet : %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Délivré par : %s\n"
@@ -664,7 +669,7 @@ 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_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -703,14 +708,14 @@ msgstr ""
 "correspondant lorsque « Tout relever » est activé"
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Nom"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -838,13 +843,13 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Adresses"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Remarques"
 
@@ -856,7 +861,7 @@ msgstr "Choisissez un dossier"
 msgid "Auto-registered address"
 msgstr "Adresses enregistrées automatiquement"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Fichier"
@@ -877,10 +882,10 @@ msgstr "/_Fichier/Nouveau carnet _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Fichier/---"
@@ -897,21 +902,21 @@ msgstr "/_Fichier/_Supprimer"
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/É_dition/Co_ller"
 
@@ -955,7 +960,7 @@ msgstr "/_Adresse/Édit_er"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Outils"
@@ -968,12 +973,12 @@ msgstr "/_Outils/Importer un fichier _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Outils/Importer un fichier _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
@@ -991,7 +996,7 @@ msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1033,7 +1038,7 @@ msgstr "Carnet d'adresses"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Dossier"
 
@@ -1045,17 +1050,17 @@ msgstr "Adresse électronique"
 msgid "Search:"
 msgstr "Rechercher :"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "À :"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Copie :"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Copie discrète :"
@@ -1266,7 +1271,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Information"
 
@@ -1322,394 +1327,399 @@ msgstr "Brun"
 msgid "None"
 msgstr "Aucun"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Ouvrir"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Ajouter..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Enlever"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Fichier/_Envoyer"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Fichier/Envoyer _plus tard"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fichier/Enregistrer parmi les _brouillons"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fichier/Enregistrer et _poursuivre la composition"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Fichier/_Joindre un fichier"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Fichier/_Insérer un fichier"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichier/Insérer la si_gnature"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Fichier/_Ajouter la signature"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/É_dition/_Annuler"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/É_dition/_Refaire"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/É_dition/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/É_dition/Co_uper"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/É_dition/Coller comme ci_tation"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/É_dition/Tout sélectio_nner"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/É_dition/Justifier le _paragraphe actuel"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/É_dition/Justifier tout le _message"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/É_dition/Justification aut_omatique"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Affichage"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Affichage/À"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Affichage/_Copie"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Affichage/Copie _discrète"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/_Affichage/_Répondre à"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Affichage/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/_Affichage/_Faire suivre"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Affichage/_Afficher une règle"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Affichage/_Pièce(s) jointe(s)"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Affichage/Personnaliser la _barre d'outils..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Affichage/_Jeu de caractères"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Affichage/_Jeu de caractères/_Automatique"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Affichage/_Jeu de caractères/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Affichage/_Jeu de caractères/ASCII 7 bits (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Affichage/_Jeu de caractères/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Affichage/_Jeu de caractères/Europe centrale (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Affichage/_Jeu de caractères/Grec (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Affichage/_Jeu de caractères/Arabe (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Affichage/_Jeu de caractères/Arabe (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Affichage/_Jeu de caractères/Turc (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Outils/_Carnet d'adresses"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Outils/_Modèle"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Outils/_Actions"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Outils/Modifier avec un éditeur e_xterne"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Outils/_Notification sur la disposition"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Outils/_Signer"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Outils/_Chiffrer"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Outils/_Vérifier l'orthographe"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Outils/_Définir la langue du message"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s : le fichier n'existe pas\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Impossible d'obtenir la partie texte\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 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:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Composition%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Signature"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Sujet absent"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Pièce jointe absente"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Il n'y a pas de pièce jointe. Envoyer sans pièce jointe ?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Vérification des destinataires"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Vraiment envoyer ce courrier aux adresses suivantes ?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
@@ -1717,11 +1727,11 @@ msgstr ""
 "Recherche des nouveaux messages encours\n"
 "Réessayez plus tard."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1729,39 +1739,39 @@ 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:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, 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:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr "Le message a été envoyé mais n'a pas pu être sauvegardé."
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, 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:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "Impossible de signer le message."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "Impossible de crypter le message."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "Impossible de crypter ou signer le message."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1772,11 +1782,11 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer avec %s ?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1789,15 +1799,15 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Chiffrement avec « Copie discrète »"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1811,94 +1821,104 @@ msgstr ""
 "\n"
 "Envoyer quand même ?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Le fichier %s n'existe pas."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Impossible d'ouvrir le fichier %s"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Type de données"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Signature"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "/_Vérification de la signature"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "Le fichier n'existe pas."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Ouverture du fichier exécutable"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1910,12 +1930,12 @@ msgstr ""
 "Vous pouvez l'enregistrer quelque part pour le lancer vous-même, mais prenez "
 "les précautions d'usage (anti-virus, etc.)."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, 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:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1924,50 +1944,50 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "Personnaliser la _barre d'outils..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Ce message a été modifié. Voulez-vous l'enregistrer dans le dossier des "
 "brouillons ?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -2008,7 +2028,7 @@ msgid "Nick Name"
 msgstr "Surnom"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Adresse électronique"
 
@@ -2066,7 +2086,7 @@ msgid " Check File "
 msgstr " Vérifier le fichier "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Fichier"
 
@@ -2074,64 +2094,64 @@ msgstr "Fichier"
 msgid "Add New Address Book"
 msgstr "Nouveau carnet d'adresses"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Donnez un nom de groupe."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Édition du groupe"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Nom du groupe"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Adresses disponibles"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Adresses dans le groupe"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Déplacer les adresses souhaitées depuis/vers le groupe avec les boutons "
 "fléchés"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Édition du groupe"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Nouveau groupe"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Édition du dossier"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -2148,7 +2168,7 @@ msgid "Edit JPilot Entry"
 msgstr "Édition de données JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2213,7 +2233,7 @@ msgstr "Délai d'attente (secs)"
 msgid "Maximum Entries"
 msgstr "Nombre maximal d'entrées"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Général"
 
@@ -2299,7 +2319,7 @@ msgid "MH (number only)"
 msgstr "MH (numéro uniquement)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Choisir... "
 
@@ -2480,12 +2500,12 @@ msgstr "Enregistrement des données des dossiers...\n"
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
@@ -3323,686 +3343,696 @@ msgstr ""
 "Une ancienne version de configuration a été trouvée.\n"
 "Voulez-vous migrer vers la nouvelle ?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Fichier/_Dossier"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fichier/_Dossier/Créer un _nouveau dossier..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fichier/_Dossier/_Renommer le dossier..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fichier/_Dossier/_Déplacer le dossier..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fichier/_Dossier/_Supprimer le dossier"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Fichier/_Boîte aux lettres"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fichier/_Boîte aux lettres/Ajouter une _boîte aux lettres..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fichier/_Boîte aux lettres/_Supprimer la boîte aux lettres"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fichier/_Boîte aux lettres/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fichier/_Boîte aux lettres/Re_chercher les nouveaux messages"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/_Fichier/_Boîte aux lettres/Rechercher les nouveaux messages dans _toutes "
 "les boîtes"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fichier/_Boîte aux lettres/Reconstruire l'_arborescence"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_Fichier/_Importer du courrier..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_Fichier/_Exporter du courrier..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Fichier/_Vider les corbeilles"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Fichier/Enregistrer _sous..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Fichier/_Mise en page..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Fichier/Im_primer..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Fichier/_Travailler déconnecté"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Fichier/_Quitter"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/É_dition/Sélectionner l'en_filade"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/É_dition/Rechercher dans le _message..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/É_dition/Rechercher dans le _dossier..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/É_dition/_Recherche rapide"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Affichage/Affic_her ou masquer"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Affichage/Affic_her ou masquer/Fenêtre des _dossiers"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Affichage/Affic_her ou masquer/Fenêtre de _message"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/Icônes _et textes"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr ""
 "/_Affichage/Affic_her ou masquer/Barre d'_outils/Textes à _droite des icônes"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Icônes seulement"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Textes seulement"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr ""
 "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Pas de barre d'outils"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Affichage/Affic_her ou masquer/Barre de _recherche"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Affichage/Affic_her ou masquer/_Barre d'état"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Affichage/Personnaliser la _barre d'outils..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/_Affichage/Disp_osition"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Affichage/Disp_osition/_Normale"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/_Affichage/Disp_osition/_Verticale"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Affichage/Séparer la fenêtre des _dossiers"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Affichage/Séparer la fenêtre des _messages"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Affichage/_Trier"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Affichage/_Trier/Trier par _numéro"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Affichage/_Trier/Trier par _taille"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Affichage/_Trier/Trier par _date"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Affichage/_Trier/Trier par date (en_filades)"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Affichage/_Trier/Trier par e_xpéditeur"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Affichage/_Trier/Trier par d_estinataire"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Affichage/_Trier/Trier par _sujet"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Affichage/_Trier/Trier par _couleur"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Affichage/_Trier/Trier par _marque"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Affichage/_Trier/Trier par non _lu"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Affichage/_Trier/Trier par pièce _jointe"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Affichage/_Trier/Ne _pas trier"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Affichage/_Trier/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Affichage/_Trier/_Ordre croissant"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Affichage/_Trier/O_rdre décroissant"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Affichage/_Trier/_Attirer par sujet"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Affichage/Affichage par _fil de conversation"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Affichage/Dé_ployer les fils de conversation"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Affichage/_Compacter les fils de conversation"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Affichage/Sélect_ion des éléments affichés..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Affichage/_Aller à"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Affichage/_Aller à/Message _précédent"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Affichage/_Aller à/Message suiva_nt"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Affichage/_Aller à/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Affichage/_Aller à/Non l_u précédent"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Affichage/_Aller à/Non _lu suivant"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Affichage/_Aller à/Message nouveau p_récédent"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Affichage/_Aller à/Message nouveau _suivant"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Affichage/_Aller à/M_arqué précédent"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Affichage/_Aller à/_Marqué suivant"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Affichage/_Aller à/C_oloré précédent"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Affichage/_Aller à/_Coloré suivant"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Affichage/_Aller à/Autre _dossier..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Affichage/_Jeu de caractères/Détection _automatique"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Affichage/Ouv_rir dans une nouvelle fenêtre"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Affichage/_Voir le message complet"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/_Affichage/Afficher tous le_s en-têtes"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Affichage/Mettre à jo_ur le résumé des messages"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Message"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_Message/Réce_ptionner"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Message/Réce_ptionner/le courrier du _compte courant"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Message/Réce_ptionner/le courrier de _tous les comptes"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Message/Réce_ptionner/_Annuler la réception"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Message/Réce_ptionner/boîte aux lettres électronique à _distance..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Message/Réce_ptionner/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Message/En_voyer les messages en file d'attente"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Message/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Message/Composer un _nouveau message"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Message/_Répondre"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Message/Rép_ondre à"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Message/Rép_ondre à/_tous"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Message/Rép_ondre à/l'_expéditeur"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Message/Rép_ondre à/la _liste"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Message/_Transférer"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Message/Transférer en tant que pièce _jointe"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Message/Rediri_ger"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Message/_Déplacer..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Message/_Copier..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Message/_Marquer"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Message/_Marquer/_Marquer"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Message/_Marquer/_Démarquer"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Message/_Marquer/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Message/_Marque/Marquer comme _non lu"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Message/_Marque/Marquer comme _lu"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Message/_Marque/Marquer l'en_filade comme lue"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Message/_Marque/Marquer _tous comme lu"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Message/_Supprimer"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Message/Marquer comme indésira_ble"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Message/Marquer comme acc_eptable"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/Réé_diter"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Outils/Aj_outer l'expéditeur dans le carnet d'adresses..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Outils/_Filtrer les messages du dossier"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Outils/Filtrer les messages _sélectionnés"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Outils/Créer une règle de f_iltrage"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Outils/Créer une règle de f_iltrage/automatiq_uement"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 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:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 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:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 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:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Outils/Filtrer les indésira_bles du dossier"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Outils/Filtrer les indésirables dans les _messages sélectionnés"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Outils/Supprimer les messages en _double"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Outils/Concaténer les messa_ges"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Outils/E_xécuter les commandes marquées"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Outils/Filtrer les indésira_bles du dossier"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Outils/_Filtrer les messages du dossier"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Outils/_Journal de connexion"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Configuration"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuration/Préférences _générales..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Configuration/_Règles de filtrage..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuration/_Modèles..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuration/_Actions..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Configuration/Gestion des _plug-ins..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Configuration/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuration/_Configuration du compte courant..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuration/Création d'un _nouveau compte..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuration/Édition des compt_es..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuration/Choi_sir un autre compte"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/A_ide/_Manuel"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/A_ide/_Manuel/_Anglais"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_ide/_Manuel/_Japonais"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Anglais"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/A_llemand"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Espagnol"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Français"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Italien"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/A_ide/_Options de la ligne de commande"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/A_ide/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/A_ide/_Rechercher des mises à jour..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/A_ide/Mises à jour des _plug-ins..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Création de la fenêtre principale...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "terminé.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "aucun"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Vous êtes déconnecté. Voulez-vous vous connecter ?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Vider toutes les corbeilles"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Effacer tous les messages des corbeilles ?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -4011,16 +4041,16 @@ msgstr ""
 "Saisissez l'emplacement de la nouvelle boîte aux lettres. Si elle\n"
 "existe déjà, elle sera automatiquement analysée."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4030,95 +4060,95 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Répondre"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Répondre à _tous"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Répondre à l'_expéditeur"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Icônes _et textes"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Textes à _droite des icônes"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "_Icônes seulement"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_Textes seulement"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_Pas de barre d'outils"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 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:3117
+#: src/mainwindow.c:3128
 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:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "Les messages sélectionnés ne peuvent pas être combinés"
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Choix d'un dossier à ouvrir"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Options de la ligne de commande"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilisation : sylpheed [OPTION]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4152,7 +4182,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4187,15 +4217,15 @@ msgstr ""
 "afficher l'aide-mémoire et quitter\n"
 "afficher les informations de version et quitter"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Option pour Windows uniquement:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "spécifier le port pour les commandes IPC distantes"
 
@@ -4428,238 +4458,238 @@ msgstr "Fichier:"
 msgid "Description: "
 msgstr "Description:"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Ouverture de la fenêtre de configuration du compte...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Compte%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Configuration du nouveau compte"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Configuration du compte"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Création de la fenêtre de configuration du compte...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Réception"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Composer"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Avancée"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Nom du compte"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Définir comme compte par défaut"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Informations personnelles"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Nom complet"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Adresse électronique"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Configuration des serveurs"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Aucun (local)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Ce serveur nécessite une authentification"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Serveur de groupes de discussion"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Serveur de réception"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Serveur SMTP (envoi)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Nom de l'utilisateur"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Utiliser l'authentification sécurisée (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Suppression des messages du serveur après réception"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Supprimer après"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "jours"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 jours : effacer immédiatement"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr ""
 "Téléchargement de tous les messages présents sur le serveur (y compris ceux "
 "déjà reçus)"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Taille maximale pour la réception"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "Ko"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtrage des messages à la réception"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Boîte de réception par défaut"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Les messages non filtrés seront placés dans ce dossier."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Méthode d'authentification"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Vérifier seulement INBOX lors de la réception"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrage des nouveaux messages à la réception"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Articles de groupes de discussion"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Nombre maximum d'articles à récupérer"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Aucune limite pour la valeur 0."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "« Tout relever » relève le courrier pour ce compte"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "En-tête"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Ajouter un champ « Date » à l'en-tête"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Génération d'un Message-ID"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Modifier... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Authentification"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Authentification SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4667,240 +4697,244 @@ msgstr ""
 "Laissez ces champs vides pour utiliser le nom d'utilisateur et le mot de "
 "passe spécifiés pour la réception."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "S'authentifier sur le POP3 avant l'envoi"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Signature"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Texte"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Nom :"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Sortie"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Placer la signature avant la citation (non recommandé)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Définition automatique des adresses suivantes"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Copie"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Copie discrète"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Répondre à"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "Signer le message par défaut"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "Chiffrer le message par défaut"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Chiffrer les réponses à un message chiffré"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 msgid "Add my own key to the recipients list on encryption"
 msgstr "Ajouter ma propre clé à la liste des destinataires au chiffrement"
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Utiliser le format ASCII-armé pour le chiffrement"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Utiliser une signature non chiffrée"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr "Clé de signature / chiffrement"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Utiliser la clé par défaut de GnuPG"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Sélectionner la clé en fonction de l'adresse électronique"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Indiquer manuellement la clé"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Utilisateur ou identificateur (ID) de clé :"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Ne pas utiliser SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Utiliser SSL pour les connexions POP3"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utiliser la commande STARTTLS pour commencer une session SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utiliser SSL pour les connexions IMAP4"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Utiliser SSL pour les connexions NNTP"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Envoi (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Utiliser SSL pour les connexions SMTP"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Utiliser SSL non-bloquant"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Désactivez ceci si vous rencontrez des problèmes de connexion SSL."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "Utiliser un proxy SOCKS"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Hôte:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Port:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Utiliser une authentification"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Nom :"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Mot de passe:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Utiliser un proxy SOCKS pour l'envoi"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Indiquer le port SMTP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Indiquer le port POP3"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Indiquer le port IMAP4"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Indiquer le port NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Indiquer le nom de domaine"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Répertoire IMAP4"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Seuls les sous-dossiers de ce dossier seront affichés."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Nettoyer les caches de message en quittant"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Placer les messages envoyés dans"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Placer les brouillons dans"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Placer les messages en attente d'envoi dans"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Placer les messages supprimés dans"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Nom du compte non indiqué."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Adresse électronique non saisie."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Serveur SMTP non indiqué."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Nom d'utilisateur manquant."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Serveur POP3 non indiqué."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Serveur IMAP4 non indiqué."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Serveur NNTP non indiqué."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Le dossier indiqué n'est pas une file d'attente."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/gl.po b/po/gl.po
index f1c1b2a2..da37c31d 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: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -29,209 +29,214 @@ msgstr "Carpeta"
 msgid "Junk mail filter"
 msgstr "Carpeta"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Perdeuse a conexión IMAP4 con %s:%d . Reconectando...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Directorio do servidor IMAP4"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 #, fuzzy
 msgid "Could not establish IMAP connection.\n"
 msgstr "Non podo establecer unha sesión IMAP4 con: %s:%d\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creando conexión IMAP4 con %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Non podo iniciar a sesión TLS.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, fuzzy, c-format
 msgid "Getting message %u"
 msgstr "Borrando mensaxe %d"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Movendo mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "non podo establecer os indicadores borrados: %d\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "non podo baleirar\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "non podo establecer os indicadores borrados: 1:%d\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Ficheiro de marcas non atopado.\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "ocurriu un erro obtendo LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Non podo crear '%s'\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Non podo crear '%s' bajo Entrada\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "non podo crear a: LIST falló\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "non podo crear a caixa de correo\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "non podo crear a caixa de correo\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "non podo renomear a caixa de correo: %s a %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "non podo borrar a caixa de correo\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "Erro obtendo a estructura da mensaxe.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Non se pode interpretar a estructura da mensaxe: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "non se pode obter a estructura da mensaxe\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Non se pode conectar con o servidor IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Non podo establecer unha sesión IMAP4 con: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "no se pode obter o espacio de nomes\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Fallo de autenticación"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "non podo engadir %s a %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(enviando ficheiro...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "non se pode engadir o mensaxe %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "non podo copiar %d a %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erro no comando imap: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non pode convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non pode convertir %s a UTF-7\n"
@@ -502,7 +507,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "ocurriu algún erro na sesión POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "fallo escribiendo a configuración a ficheiro\n"
@@ -554,50 +559,50 @@ msgstr ""
 msgid "error occurred on SMTP session\n"
 msgstr "ocurriu algún erro na sesión SMTP\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 non está disponible\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 disponible\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 non está disponible\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 disponible\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "Método SSL non disponible\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Método SSL desconocido *ERROR no PROGRAMA*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Error creando o contexto SSL\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Conexión SSL usando %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Certificado do servidor:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Asunto: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Xenerador: %s\n"
@@ -657,7 +662,7 @@ 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_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -696,14 +701,14 @@ msgstr ""
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -831,13 +836,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Enderezo"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notas"
 
@@ -850,7 +855,7 @@ msgstr "Seleccionar carpeta da axenda"
 msgid "Auto-registered address"
 msgstr "Regas rexistradas"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Ficheiro"
@@ -872,10 +877,10 @@ msgstr "/_Ficheiro/Novo _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
@@ -892,21 +897,21 @@ msgstr "/_Ficheiro/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
@@ -953,7 +958,7 @@ msgstr "/_Enderezo/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -967,12 +972,12 @@ msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -990,7 +995,7 @@ msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1034,7 +1039,7 @@ msgstr "Axenda de enderezos"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -1047,17 +1052,17 @@ msgstr "Enderezo e-mail"
 msgid "Search:"
 msgstr "Buscar"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1272,7 +1277,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1328,449 +1333,454 @@ msgstr "Marrón"
 msgid "None"
 msgstr "Ningún"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Abrir"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Engadir"
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/compose.c:581
+#: src/compose.c:586
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Mensaxe/Enviar _logo"
 
-#: src/compose.c:584
+#: src/compose.c:589
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Mensaxe/_Gardar como borrador"
 
-#: src/compose.c:586
+#: src/compose.c:591
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Mensaxe/Gardar e _seguir editando"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Ficheiro/_Adxuntar ficheiro"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Ficheiro/_Inserir ficheiro"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Ficheiro/Inserir _sinatura"
 
-#: src/compose.c:593
+#: src/compose.c:598
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Ficheiro/Inserir _sinatura"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfacer"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refacer"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Cor_tar"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Cortar todas as líneas longas"
 
-#: src/compose.c:612
+#: src/compose.c:617
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Ver"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Ver/C_opia oculta"
 
-#: src/compose.c:617
+#: src/compose.c:622
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Ver/_Respostar a"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Ver/_Engadir a"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regra"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adxuntos"
 
-#: src/compose.c:625
+#: src/compose.c:630
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/_Codificación/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/_Codificación/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/_Codificación/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/_Codificación/Turco (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/_Codificación/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Codificación/Chines tradicional (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/_Codificación/Coreano (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/_Codificación/Tailandés (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/_Codificación/Tailandés (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Axenda de enderezos"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con editor e_xterno"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:728
+#: src/compose.c:733
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:733
+#: src/compose.c:738
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Ferramentas/E_xecutar"
 
-#: src/compose.c:734
+#: src/compose.c:739
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Non se pode obter o texto\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 #, fuzzy
 msgid "Quote mark format error."
 msgstr "Marca de cita para erro."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, 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:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Sinatura"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 #, fuzzy
 msgid "Empty subject"
 msgstr "Asunto"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Adxuntos"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 #, fuzzy
 msgid "_Send"
 msgstr "Enviar"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1778,42 +1788,42 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, 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:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1824,12 +1834,12 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1838,15 +1848,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1855,98 +1865,108 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Non poido abrir %s\n"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Data"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Sinatura"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Verificando sinatura"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: o ficheiro non existe\n"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1954,12 +1974,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, 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:6956
+#: src/compose.c:7051
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1969,52 +1989,52 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -2056,7 +2076,7 @@ msgid "Nick Name"
 msgstr "Alcume"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Enderezo e-mail"
 
@@ -2115,7 +2135,7 @@ msgid " Check File "
 msgstr " Comprobar ficheiro "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Ficheiro"
 
@@ -2124,62 +2144,62 @@ msgstr "Ficheiro"
 msgid "Add New Address Book"
 msgstr "Engadir nova axenda"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Debe proporcionar un nome de grupo"
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Editar datos do grupo"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Nome de grupo"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Enderezos disponibles"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Enderezos no grupo"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mover os enderezos de correo dende/cara o grupo con as flechas"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Editar detalles do grupo"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Engadir novo grupo"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Editar carpeta"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -2196,7 +2216,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2261,7 +2281,7 @@ msgstr "Tiempo límite (seg.)"
 msgid "Maximum Entries"
 msgstr "Nº entradas máximas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Basico"
 
@@ -2354,7 +2374,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr "Seleccionar..."
 
@@ -2549,12 +2569,12 @@ msgstr "Establecendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -3398,735 +3418,745 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Ficheiro/_Carpeta"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Ficheiro/_Carpeta_/Crear _nova carpeta..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Ficheiro/_Carpeta_/_Renomear carpeta..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Ficheiro/_Carpeta_/_Renomear carpeta..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Ficheiro/_Carpeta_/_Borrar carpeta"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Ficheiro/_Engadir caixa de correo"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Ficheiro/_Engadir caixa de correo"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Eliminar _mailbox"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Ficheiro/_Carpeta"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Comprobar si hai mensaxes novas"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Ficheiro/_Comprobar mensaxes novas en todas as carpetas"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/R_econstruir árbre de carpetas"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 #, fuzzy
 msgid "/_File/_Import mail data..."
 msgstr "/_Ficheiro/I_mportar ficheiro mbox..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_File/_Export mail data..."
 msgstr "/_Ficheiro/_Exportar a ficheiro mbox..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Ficheiro/_Baleirar Papeleira"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Ficheiro/_Gardar como..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Ficheiro/_Gardar como..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Ficheiro/_Imprimir"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Ficheiro/_Inserir ficheiro"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Ficheiro/Sai_r"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _fio"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar na mensaxe actual..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edición/_Buscar en carpeta..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 #, fuzzy
 msgid "/_Edit/_Quick search"
 msgstr "/_Editar/_Pegar"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Ver/Mostrar ou o_cultar"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ver/Mostrar ou o_cultar/_Arbre de carpetas"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ver/Mostrar ou o_cultar/_Mensaxes"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/Iconos _e texto"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Iconos"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Iconos"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Texto"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Ocultar"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 #, fuzzy
 msgid "/_View/Layou_t"
 msgstr "/_Ver/_Ordear"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 #, fuzzy
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Ver/_Ordear/Por _remitente"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr ""
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar arb_re de carpetas"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensaxes"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordear"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordear/Por _número"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordear/Por tamañ_o"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordear/Por _data"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Ver/_Ordear/Por _data"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordear/Por _remitente"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordear/Por _destinatario"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordear/Por as_unto"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordear/Por _cor da etiqueta"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordear/Por _marca"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ver/_Ordear/Por _non leído"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordear/Por adxun_to"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordear/N_on ordear"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordear/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordear/Ascendente"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordear/Atraer _por asunto"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista xerárquica"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos os fios"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos os fios"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Ver/Elementos visibles..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaxe a_nterior"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaxe s_eguinte"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin ler"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Seguinte sin ler"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaxe no_va anterior"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaxe nova s_eguinte"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaxe marcada a_nterior"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Seguinte mensaxe _marcada"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaxe etiqueta_da anterior"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Seguinte Mensaxe e_tiquetada"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/_Codificación/_Autodetectar"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/_Codificación/Xaponés (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Codificación/Xaponés (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/_Codificación/Chines tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Codificación/Chines (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Codificación/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en fiestra _nova"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fonte da mens_axe"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Ver/Todas as cabeceiras"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Mensaxe"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Mensaxe/_Cancelar recepción"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaxe/Enviar mensa_xes da cola"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Mensaxe/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaxe/Compoñer _nova mensaxe"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Mensaxe/_Respostar"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaxe/Respos_tar a"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaxe/Respos_tar a/A _todos"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaxe/Respos_tar a/Ó _remitente"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaxe/Respos_tar a/Á _lista de correo"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Mensaxe/_Reenviar"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaxe/Reen_viar como adxunto"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaxe/Red_irixir"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaxe/M_over..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaxe/_Copiar..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Mensaxe/_Marcar"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 #, fuzzy
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Mensaxe/_Marcar/_Marcar"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Mensaxe/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaxe/_Marcar/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaxe/_Marcar/Marcar como non leído"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaxe/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Mensaxe/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaxe/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Mensaxe/_Borrar"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Ferramentas/Engadir _remitente á axenda"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Crear Regra de filtrado"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Dende"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Para"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada no _Asunto"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/Borrar as mensaxes re_petidas"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 #, fuzzy
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Ferramentas/Borrar as mensaxes re_petidas"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Ferramentas/_Filtrar Mensaxes"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Ferramentas/_Filtrar Mensaxes"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Fiestra de traza"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comuns..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 #, fuzzy
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Accions..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 #, fuzzy
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias da conta actual..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nova conta..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar contas..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar conta actual"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Axuda/_Manual"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Axuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Axuda/_Manual/_Xaponés"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Axuda/_FAQ"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Axuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Axyuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Axuda/_FAQ/_Español"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Axuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Axuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Non se estableceu o comando."
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Axuda/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr ""
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr ""
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Creando Fiestra principal...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Sen título"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "ningunha"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Baleirar papeleira"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Engadir caixa de correo"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -4137,16 +4167,16 @@ msgstr ""
 "Si xa existe será\n"
 "examinado automáticamente."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4156,104 +4186,104 @@ msgstr ""
 "Quizáis xa existan os ficheiros ou non teña permisos suficientes para "
 "escribir no directorio."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Arbre de carpetas"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Respostar"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Iconos"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 #, fuzzy
 msgid "_Text"
 msgstr "Texto"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 #, fuzzy
 msgid "_None"
 msgstr "Ningún"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "¿Sair do programa?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Seleccionar carpeta"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 #, fuzzy
 msgid "Command line options"
 msgstr "Non se estableceu o comando."
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4272,7 +4302,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4291,15 +4321,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4547,245 +4577,245 @@ msgstr "Ficheiro"
 msgid "Description: "
 msgstr "Descripción"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Abrindo Fiestra de preferencias de conta...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "conta%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Preferencias para unha nova conta"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Preferencias da conta"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Creando Fiestra de preferencias de conta...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Recibir"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Enviar"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Compoñer"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Nome desta conta"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "conta por defecto"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Información persoal"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Enderezo de correo"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organización"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Información do servidor"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Novas (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Ningunha (local)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Este servidor require autenticación"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Servidor de novas"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Contrasinal"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Este servidor require autenticación"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Eliminar mensaxes do servidor ó recibir"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Eliminar despois de"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "días"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 días: eliminar inmediatamente)"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Descargar todas as mensaxes do servidor"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Tamaño límite para recibir"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensaxes ó recibir"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Caixa de correo por defecto"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(As mensaxes sen filtrar gardaránse nesta carpeta)"
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automática"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrar mensaxes ó recibir"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Novas"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Número máximo de artigos a descargar\n"
 "(sen límite si se especifica 0)"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Traer todo' comproba si hai mensaxes novas nesta conta"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabeceira"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Engadir campo Data"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Xenerar ID-Mensaxe"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Engadir cabeceira de usuario"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticación SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4794,251 +4824,255 @@ msgstr ""
 "Si deixa estes campos valeiros, utilizaráse o mesmo\n"
 "ID de usuario e contrasinal usados para a recepción."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticación con POP3 antes de enviar"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Sinatura"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Nome:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 #, fuzzy
 msgid "Command output"
 msgstr "Saida do comando"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Respostar a"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Asinar a mensaxe por defecto"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Encriptar a mensaxe por defecto"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII blindado para encriptación"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Usar sinatura de texto claro"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Usar clave GnuPG por defecto"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Seleccionar clave por dirección de correo"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Especificar clave manualmente"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Usuario ou ID clave:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Non usar SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para a conexión POP3"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar o comando STARTTLS para abrir a sesión SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para a conexión IMAP4"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para a conexión NNTP"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para a conexión SMTP"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 #, fuzzy
 msgid "Hostname:"
 msgstr "Nome máquina"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 #, fuzzy
 msgid "Port:"
 msgstr "Porto"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 #, fuzzy
 msgid "Use authentication"
 msgstr "Autenticación"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Nome:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 #, fuzzy
 msgid "Password:"
 msgstr "Contrasinal"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 #, fuzzy
 msgid "Use SOCKS proxy on sending"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Porto SMTP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Porto POP3"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Porto IMAP4"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Porto NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Nome do dominio"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Directorio do servidor IMAP4"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Descargar todas as mensaxes do servidor"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Poñer mensaxes enviadas en"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Poñer borradores de mensaxes en"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Poñer mensaxes borradas en"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Poñer mensaxes borradas en"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Non se especificou o nome de conta."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Non se especificou o enderezo de correo."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Non se especificou o servidor SMTP."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Non se especificou o usuario."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Non se especificou o servidor POP3."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Non se especificou o servidor IMAP4."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Non se especificou o servidor NNTP."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/he.po b/po/he.po
index cb3bb17a..725cfa04 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2014-05-31 17:08+0200\n"
 "Last-Translator: Isratine Citizen <genghiskhan@gmx.ca>\n"
 "Language-Team: Rahut <translators@lists.claws-mail.org>\n"
@@ -32,202 +32,207 @@ msgid "Junk mail filter"
 msgstr "מסנן דואר פסולת"
 
 # מחדש חיבור כעת
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "חיבור IMAP4 אל %s התנתק. כעת מחדש חיבור...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "שרת IMAP4 מנטרל LOGIN.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "לא היתה אפשרות לבסס חיבור IMAP.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "כעת יוצר חיבור IMAP4 אל %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "לא מסוגל להתחיל סשן TLS.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(כעת מאחזר FLAGS...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "כעת משיג הודעה %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "כעת מצרף הודעות אל %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Moving messages %s to %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copying messages %s to %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "כעת מסיר הודעות %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "לא מסוגל לקבוע דגלים מחוקים: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "לא מסוגל לטהר\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "כעת מסיר את כל ההודעות בתוך %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "לא מסוגל לקבוע דגלים מחוקים: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "לא מסוגל לסגור תיקייה\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "תיקיית שורש %s לא קיימת\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "אירעה שגיאה במהלך השגת LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "לא מסוגל ליצור '%s'\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "לא מסוגל ליצור '%s' תחת INBOX\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "לא מסוגל ליצור תיבת דואר: LIST נכשל\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "לא מסוגל ליצור תיבת דואר\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "לא מסוגל ליצור תיבת דואר\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "לא מסוגל לשנות שם תיבת דואר: %s אל %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "לא מסוגל למחוק תיבת דואר\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "כעת משיג תקורות הודעה (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "אירעה שגיאה במהלך השגת מעטפה.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "לא מסוגל לפענח מעטפה: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "לא מסוגל להשיג מעטפה\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "לא מסוגל להתחבר לשרת IMAP4‏: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "לא מסוגל לבסס הפעלת IMAP4 עם: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "לא מסוגל להשיג namespace\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "לא מסוגל לבחור תיקייה: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "אירעה שגיאה בפקודת imap: ‏STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "אימות IMAP4 נכשל.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "כניסת IMAP4 נכשלה.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "לא מסוגל לצרף את %s אל %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(כעת שולח קובץ...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "לא מסוגל לצרף הודעה אל %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "לא מסוגל להעתיק את %s אל %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "אירעה שגיאה במהלך פקודת imap: ‏STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "אירעה שגיאה במהלך פקודת imap: ‏EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "אירעה שגיאה במהלך פקודת imap: ‏CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "‏iconv לא יכול להמיר UTF-7 אל %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "‏iconv לא יכול להמיר %s אל UTF-7\n"
@@ -497,7 +502,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "אירעה שגיאה בסשן POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "נכשל לכתוב תצורה לקובץ\n"
@@ -550,50 +555,50 @@ msgstr "היענות SMTP רעה\n"
 msgid "error occurred on SMTP session\n"
 msgstr "אירעה שגיאה בסשן SMTP\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 not available\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 available\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 not available\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 available\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "שיטת SSL לא זמינה\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "שיטץ SSL לא מוכרת *שגיאת תוכנית*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "שגיאה ביצירת הקשר ssl\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "חיבור SSL באמצעות %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "תעודת שרת:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  נושא: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  מנפיק: %s\n"
@@ -655,7 +660,7 @@ msgstr ""
 "Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA "
 "02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -692,14 +697,14 @@ msgstr ""
 "בטור `G' כדי לאפשר אחזרת הודעות ע״י `השג הכל'."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "שם"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "פרוטוקול"
 
@@ -825,13 +830,13 @@ msgstr "ארגומנט משתמש של פעולה"
 msgid "Add Address to Book"
 msgstr "הוספת כתובת לפנקס"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "פנקס"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "הערות"
 
@@ -843,7 +848,7 @@ msgstr "בחירת תיקיית פנקס כתובות"
 msgid "Auto-registered address"
 msgstr "כתובת רשומה-אוטומטית"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_קובץ"
@@ -864,10 +869,10 @@ msgstr "‫_/_קובץ/‏_JPilot חדש"
 msgid "/_File/New _LDAP Server"
 msgstr "/_קובץ/_שרת LDAP חדש"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_קובץ/---"
@@ -884,21 +889,21 @@ msgstr "/_קובץ/_מחק"
 msgid "/_File/_Save"
 msgstr "/_קובץ/_שמור"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_קובץ/_סגור"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/ע_ריכה"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/ע_ריכה/ה_עתק"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/ע_ריכה/ה_דבק"
 
@@ -942,7 +947,7 @@ msgstr "/כ_תובת/_ערוך"
 msgid "/_Address/_Delete"
 msgstr "/כ_תובת/_מחק"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_כלים"
@@ -955,12 +960,12 @@ msgstr "/_כלים/יבא קובץ _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_כלים/יבא קובץ _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_עזרה"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_עזרה/_אודות"
@@ -978,7 +983,7 @@ msgid "/New _Folder"
 msgstr "/_תיקייה חדשה"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1021,7 +1026,7 @@ msgstr "פנקס כתובות"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "תיקייה"
 
@@ -1033,17 +1038,17 @@ msgstr "כתובת דוא״ל"
 msgid "Search:"
 msgstr "חפש:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "לכבוד:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "עותק:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "עותק סמוי:"
@@ -1247,7 +1252,7 @@ msgstr "כתובת כללית"
 msgid "Personal address"
 msgstr "כתובת אישית"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "התראה"
 
@@ -1304,406 +1309,411 @@ msgstr "חום"
 msgid "None"
 msgstr "ללא"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_פתח"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/הו_סף..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/הס_ר"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_מאפיינים..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_קובץ/_שלח"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_קובץ/שלח _מאוחר יותר"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_קובץ/שמור לתיקיית _טיוטה"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_קובץ/ש_מור והמשך לערוך"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_קובץ/ס_פח קובץ"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_קובץ/ש_בץ קובץ"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_קובץ/שבץ _חתימה"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_קובץ/צרף ח_תימה"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/ע_ריכה/בט_ל"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/ע_ריכה/בצע _שוב"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/ע_ריכה/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/ע_ריכה/_גזור"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/ע_ריכה/הדבק בתור _ציטטה"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/ע_ריכה/_בחר הכל"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/ע_ריכה/_כרוך פסקה נוכחית"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/ע_ריכה/כרוך _שורות ארוכות"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/ע_ריכה/כרוך _אוטומטית"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_תצוגה"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_תצוגה/_To"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_תצוגה/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_תצוגה/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/_תצוגה/_Reply-To"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_תצוגה/---"
 
 # עוקב-את
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/_תצוגה/_Followup-To"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_תצוגה/_סרגל"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_תצוגה/ת_צריף"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_תצוגה/ה_תאם סרגל כלים..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_תצוגה/_קידוד תווים"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_תצוגה/_קידוד תווים/_אוטומטי"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_תצוגה/_קידוד תווים/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_תצוגה/_קידוד תווים/7bit ascii ‏(US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_תצוגה/_קידוד תווים/Unicode ‏(_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_תצוגה/_קידוד תווים/מערב אירופאי (ISO-8859-1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_תצוגה/_קידוד תווים/מערב אירופאי (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_תצוגה/_קידוד תווים/מרכז אירופאי (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_תצוגה/_קידוד תווים/_בלטי (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_תצוגה/_קידוד תווים/בלטי (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_תצוגה/_קידוד תווים/בלטי (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_תצוגה/_קידוד תווים/יווני (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_תצוגה/_קידוד תווים/ערבי (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_תצוגה/_קידוד תווים/ערבי (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_תצוגה/_קידוד תווים/עברי (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_תצוגה/_קידוד תווים/עברי (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_תצוגה/_קידוד תווים/טורקי (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_תצוגה/_קידוד תווים/קירילי (ISO-8859-5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_תצוגה/_קידוד תווים/קירילי (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_תצוגה/_קידוד תווים/קירילי (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_תצוגה/_קידוד תווים/קירילי (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_תצוגה/_קידוד תווים/יפני (ISO-2022-JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_תצוגה/_קידוד תווים/סינית מפושטת (GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_תצוגה/_קידוד תווים/סינית מפושטת (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_תצוגה/_קידוד תווים/סינית מסורתית (Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_תצוגה/_קידוד תווים/קוריאני (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_תצוגה/_קידוד תווים/תאי (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_תצוגה/_קידוד תווים/תאי (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_כלים/פנקס _כתובות"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_כלים/_תבנית"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_כלים/_פעולות"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_כלים/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_כלים/ערוך בעזרת עורך חי_צוני"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_כלים/בקש התראת _מסירה"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_כלים/_חתום PGP"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_כלים/ה_צפן PGP"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_כלים/_בדוק איות"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_כלים/_קבע שפת איות"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: קובץ לא קיים\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "לא מסוגל להשיג אזור טקסט\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr ""
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 #, fuzzy
 msgid "Message reply/forward format error."
 msgstr "שגיאת פורמט From של הודעה חדשה."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "קובץ %s לא קיים\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "לא מסוגל להשיג גודל קובץ של %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "קובץ %s הינו ריק."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "לא מסוגל לקרוא %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "הודעה: %s"
 
 # multipartite
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "לא מסוגל להשיג חלק של הודעה מרובת חלקים."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(אין נושא)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - הלחנה%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "חתום"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "נמען אינו מצוין."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "נושא ריק"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "נושא הינו ריק. לשלוח בכל מקרה?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "חסר תצריף"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "אין תצריף. לשלוח בלי תצריפים?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 #, fuzzy
 msgid "Check recipients"
 msgstr "נמען"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr ""
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "מאת:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "נושא:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "_שלח"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr ""
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "לא מסוגל להשיג רשימת נמענים."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1711,41 +1721,41 @@ msgstr ""
 "חשבון לשליחת דואר אינו מצוין.\n"
 "אנא בחר חשבון דואר לפני שליחה."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, fuzzy, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "אירעה שגיאה במהלך פרסום ההודעה אצל %s."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "לא מסוגל לחתום הודעה."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "לא מסוגל להצפין הודעה."
 
 # multipartite
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "לא מסוגל להצפין או לחתום הודעה."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 #, fuzzy
 msgid "can't change file mode\n"
 msgstr "לא מסוגלת ליצור תיבת דואר"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1756,11 +1766,11 @@ msgstr ""
 "\n"
 "לשלוח זאת בתור הודעת %s בכל מקרה?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "שגיאת המרת קוד"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1773,15 +1783,15 @@ msgstr ""
 "\n"
 "לשלוח למרות זאת?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "הגבלת אורך שורה"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "הצפנה עם Bcc"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 #, fuzzy
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
@@ -1796,94 +1806,104 @@ msgstr ""
 "\n"
 "Send it anyway?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "לא מסוגל להסיר את ההודעה הישנה\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "כעת מניח הודעה בתור...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "לא מסוגל למצוא תיקיית תור\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "לא מסוגל להניח הודעה בתור\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "קובץ %s לא קיים."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "לא מסוגל לפתוח קובץ %s."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "כעת יוצר חלון הלחנה...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "חתום PGP"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "הצפן PGP"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "טיפוס מידע"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "גודל"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "חתום"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "כעת בודק חתימה"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "טיפוס MIME שגוי."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "קובץ אינו קיים או שהינו ריק."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "מאפיינים"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "טיפוס MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "קידוד"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "נתיב"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "שם קובץ"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "קובץ לא קיים."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "פתיחת קובץ הרצה"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1891,12 +1911,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr ""
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1905,48 +1925,48 @@ msgstr ""
 "העורך החיצוני עדיין עובד כעת.\n"
 "לכפות סיום תהליך (pid: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "_התאם סרגל כלים..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "לא מסוגל להשים הודעה בתור."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "בחירת קובץ"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "בחירת קובץ"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "שמירת הודעה"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "הודעה זו שונתה. לשמור אותה לתיקיית טיוטה?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "_סגור בלי לשמור"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "האם ברצונך להחיל את התבנית `%s' ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "החלת תבנית"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_החלף"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_שבץ"
 
@@ -1987,7 +2007,7 @@ msgid "Nick Name"
 msgstr "שם כינוי"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "כתובת דוא״ל"
 
@@ -2045,7 +2065,7 @@ msgid " Check File "
 msgstr " בדוק קובץ "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "קובץ"
 
@@ -2053,62 +2073,62 @@ msgstr "קובץ"
 msgid "Add New Address Book"
 msgstr "הוספת פנקס כתובות חדש"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "יש לספק שם קבוצה."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "עריכת מידע קבוצה"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "שם קבוצה"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "כתובות זמינות"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "כתובות בקבוצה"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "העבר כתובת דוא״ל לתוך או מתוך קבוצה בעזרת לחצני חיצים"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "עריכת פרטי קבוצה"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "הוספת קבוצה חדשה"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "ערוך תיקייה"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "הזן שם חדש של תיקייה:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "תיקייה חדשה"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "הזן שם של תיקייה חדשה:"
 
@@ -2125,7 +2145,7 @@ msgid "Edit JPilot Entry"
 msgstr "עריכת רשומת JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2192,7 +2212,7 @@ msgstr "פקיעת זמן (שניות)"
 msgid "Maximum Entries"
 msgstr "רשומות מרביות"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "בסיסי"
 
@@ -2278,7 +2298,7 @@ msgid "MH (number only)"
 msgstr "‏MH (מספר בלבד)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " בחר...  "
 
@@ -2462,12 +2482,12 @@ msgstr "Setting folder info...\n"
 msgid "Setting folder info..."
 msgstr "כעת מגדיר מידע תיקייה..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "כעת סורק תיקייה %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "כעת סורק תיקייה %s ..."
@@ -3282,684 +3302,694 @@ msgstr ""
 "תצורה עבור %s נמצאה.\n"
 "האם ברצונך למזג את תצורה זו?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_קובץ/_תיקייה"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_קובץ/_תיקייה/צור תיקייה _חדשה..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_קובץ/_תיקייה/_שנה שם תיקייה..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_קובץ/_תיקייה/_העבר תיקייה..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_קובץ/_תיקייה/_מחק תיקייה"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_קובץ/תיבת _דואר"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_קובץ/תיבת _דואר/_הוסף תיבת דואר..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_קובץ/תיבת _דואר/ה_סר תיבת דואר"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_קובץ/תיבת _דואר/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_קובץ/תיבת _דואר/_בדוק _הודעות חדשות"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_קובץ/תיבת _דואר/ב_דוק עבור הודעות חדשות בכל התיבות דואר"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_קובץ/תיבת _דואר/בנה מ_חדש עץ תיקייה"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_קובץ/י_בא נתוני דואר..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_קובץ/יצ_א נתוני דואר..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_קובץ/_רוקן את כל האשפה"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_קובץ/_שמור בשם..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_קובץ/_מבנה עמוד..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_קובץ/_הדפס..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_קובץ/_עבוד לא־מקוון"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_קובץ/י_ציאה"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/ע_ריכה/בחר _שרשור"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/ע_ריכה/_חפש בתוך הודעה נוכחית..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/ע_ריכה/חפש _הודעות..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/ע_ריכה/חיפוש _מהיר"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_תצוגה/_הצג או הסתר"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_תצוגה/_הצג או הסתר/_עץ תיקייה"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_תצוגה/_הצג או הסתר/_תצוגת הודעה"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_תצוגה/_הצג או הסתר/_סרגל כלים"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_תצוגה/_הצג או הסתר/_סרגל כלים/סמל ו_גם טקסט"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_תצוגה/_הצג או הסתר/_סרגל כלים/טקסט בצד י_מין"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_תצוגה/_הצג או הסתר/_סרגל כלים/_סמל"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_תצוגה/_הצג או הסתר/_סרגל כלים/_טקסט"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_תצוגה/_הצג או הסתר/_סרגל כלים/_כלום"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_תצוגה/_הצג או הסתר/שורת _חיפוש"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_תצוגה/_הצג או הסתר/_שורת מצב"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_תצוגה/ה_תאם סרגל כלים..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/_תצוגה/מער_ך"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_תצוגה/מער_ך/_רגיל"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/_תצוגה/מער_ך/_ניצב"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_תצוגה/ה_פרד עץ תיקייה"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_תצוגה/הפ_רד תצוגת הודעה"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_תצוגה/_מיין"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_תצוגה/_מיין/לפי _מספר"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_תצוגה/_מיין/לפי _גודל"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_תצוגה/_מיין/לפי _תאריך"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_תצוגה/_מיין/לפי תאריך ש_רשור"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_תצוגה/_מיין/לפי _מאת"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_תצוגה/_מיין/לפי _נמען"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_תצוגה/_מיין/לפי _נושא"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_תצוגה/_מיין/לפי _צבע תווית"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_תצוגה/_מיין/לפי _סימן"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_תצוגה/_מיין/לפי _לא נקרא"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_תצוגה/_מיין/לפי ת_צריף"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_תצוגה/_מיין/_אל תמיין"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_תצוגה/_מיין/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_תצוגה/_מיין/סדר עולה"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_תצוגה/_מיין/סדר יורד"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_תצוגה/_מיין/מ_שוך לפי נושא"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_תצוגה/תצוגת ש_רשור"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_תצוגה/ה_רחב את כל השרשורים"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_תצוגה/צמצ_ם את כל השרשורים"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_תצוגה/_קבע פריט הצגה..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_תצוגה/_עבור אל"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_תצוגה/_עבור אל/הודעה _קודמת"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_תצוגה/_עבור אל/הודעה _באה"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_תצוגה/_עבור אל/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_תצוגה/_עבור אל/הודעה קו_דמת שלא נקראה"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_תצוגה/_עבור אל/הודעה ב_אה שלא נקראה"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_תצוגה/_עבור אל/הודעה _חדשה קודמת"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_תצוגה/_עבור אל/הודעה ח_דשה באה"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_תצוגה/_עבור אל/הודעה _מסומנת קודמת"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_תצוגה/_עבור אל/הודעה מ_סומנת באה"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_תצוגה/_עבור אל/הודעה מסוו_גת קודמת"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_תצוגה/_עבור אל/הודעה מסווג_ת באה"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_תצוגה/_עבור אל/תיקייה _אחרת..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_תצוגה/_קידוד תווים/_אתר אוטומטית"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_תצוגה/_קידוד תווים/מערב אירופאי (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_תצוגה/_קידוד תווים/יפני (ISO-2022-JP)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_תצוגה/_קידוד תווים/יפני (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_תצוגה/_קידוד תווים/יפני (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_תצוגה/_קידוד תווים/סינית מסורתית (EUC-TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_תצוגה/_קידוד תווים/סיני (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_תצוגה/_קידוד תווים/קוריאני (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_תצוגה/פתח בתוך _חלון חדש"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_תצוגה/מ_קור הודעה"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/_תצוגה/כל ה_תקורות"
 
 # סיכום
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_תצוגה/עדכן תמ_צית"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_הודעה"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_הודעה/_קבל"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_הודעה/_קבל/השג מתוך חשבון _נוכחי"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_הודעה/_קבל/השג מתוך _כל החשבונות"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_הודעה/_קבל/_הפסק קבלה"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_הודעה/_קבל/_תיבת דואר מרוחקת..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_הודעה/_קבל/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_הודעה/_שלח הודעות בהמתנה"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_הודעה/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_הודעה/הלחן הודעה _חדשה"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_הודעה/_השב"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_הודעה/השב _אל"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_הודעה/השב _אל/השב ל_כולם"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_הודעה/השב _אל/השב לממען"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_הודעה/השב _אל/השב לרשימת-דיוור"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_הודעה/_קדם"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_הודעה/קדם בתור _תצריף"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_הודעה/ה_כוון מחדש"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_הודעה/ה_עבר..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_הודעה/הע_תק..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_הודעה/_סמן"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_הודעה/_סמן/קבע _דגל"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_הודעה/_סמן/_בטל קביעת דגל"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_הודעה/_סמן/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_הודעה/_סמן/סמן בתור לא _נקרא"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_הודעה/_סמן/סמן בתור נקר_א"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_הודעה/_סמן/סמן _שרשור ככזה שנקרא"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_הודעה/_סמן/סמן את _כולן ככאלה שנקראו"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_הודעה/_מחק"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_הודעה/קבע בתור דואר _פסולת"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_הודעה/קבע בתור דואר שאינו פ_סולת"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_הודעה/_ערוך מחדש"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_כלים/הוסף _ממען לפנקס כתובות..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_כלים/_סנן את כל ההודעות בתיקייה"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_כלים/סנן הודעות _נבחרות"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_כלים/_צור חוק סינון"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_כלים/_צור חוק סינון/_אוטומטית"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_כלים/_צור חוק סינון/לפי _From"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_כלים/_צור חוק סינון/לפי _To"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_כלים/_צור חוק סינון/לפי _Subject"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_כלים/_סנן הודעות פסולת בתיקייה"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_כלים/_סנן הודעות פסולת בהודעות נבחרות"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_כלים/מחק הודעות כ_פולות"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_כלים/_חבר הודעות נבחרות"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_כלים/בצ_ע תהליך מסומן"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_כלים/_סנן הודעות פסולת בתיקייה"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_כלים/_סנן את כל ההודעות בתיקייה"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_כלים/חלון _יומן"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/ת_צורה"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/ת_צורה/_העדפות כלליות..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/ת_צורה/הגדרות מ_סנן..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/ת_צורה/_תבנית..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/ת_צורה/_פעולות..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/ת_צורה/_מנהל תוספים..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/ת_צורה/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/ת_צורה/העדפות עבור חשבון _נוכחי..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/ת_צורה/_צור חשבון חדש..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/ת_צורה/_ערוך חשבונות..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/ת_צורה/_החלף חשבון נוכחי"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_עזרה/_מדריך"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_עזרה/_מדריך/_אנגלית"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_עזרה/_מדריך/_יפנית"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_עזרה/_שו״ת"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_עזרה/_שו״ת/_אנגלית"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_עזרה/_שו״ת/_גרמנית"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_עזרה/_שו״ת/_ספרדית"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_עזרה/_שו״ת/_צרפתית"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_עזרה/_שו״ת/א_יטלקית"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_עזרה/א_פשרויות שורת פקודה"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_עזרה/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/_עזרה/_בדיקת עדכון..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/_עזרה/בדיקת עדכון של _תוספים..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Creating main window...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "done.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "ללא כותרת"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "אין חשבון"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "לא־מקוון"
 
 # הקלקה על הצלמית תובילך אל מצב מקוון
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "אתה לא־מקוון. להחליף מצב למקוון?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "ריקון אשפה"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "מחיקת כל ההודעות בתיקיות אשפה?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "הוספת תיבת דואר"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3970,16 +4000,16 @@ msgstr ""
 "כאשר תיבת הדואר הקיימת תצוין, זו\n"
 "תיסרק באופן אוטומטי."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "תיבת דואר `%s' כבר קיימת."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "תיבת דואר"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3988,96 +4018,96 @@ msgstr ""
 "יצירה של תיבת דואר נכשלה.\n"
 "ייתכן כי קבצים מסוימים כבר קיימים, או שלא עומדת לרשותך ההרשאה לכתוב כאם."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - תצוגת תיקייה"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - תצוגת הודעה"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/ה_שב"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/השב ל_כולם"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/השב ל_ממען"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/השב ל_רשימת-דיוור"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_קדם"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/קדם בתור _תצריף"
 
 # הפנה מחדש
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/ה_כוון מחדש"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "סמל ו_גם טקסט"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "טקסט בצ_ד ימין של סמל"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "_סמל"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_טקסט"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_ללא"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "מצבך לא־מקוון. לחיצה על הסמל תעביר אותך למצב מקוון."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "מצבך מקוון. לחיצה על הסמל תעביר אותך למצב לא־מקוון."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "יציאה"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "לצאת מתוכנית זו?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "לא היתה אפשרות לשלב את ההודעות הנבחרות."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "בחירת תיקייה לפתיחה"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "אפשרויות שורת פקודה"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Usage: sylpheed [OPTION]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4111,7 +4141,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4145,15 +4175,15 @@ msgstr ""
 "‭אצו וז הרזע תא גצה\n"
 "‭אצו אסריג עדימ טולפ"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Windows-only option:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "specify port for IPC remote commands"
 
@@ -4390,240 +4420,240 @@ msgstr "קובץ: "
 msgid "Description: "
 msgstr "תיאור: "
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "כעת פותח חלון העדפות חשבון...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "חשבון%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "העדפות עבור חשבון חדש"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "העדפות חשבון"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "כעת יוצר חלון העדפות חשבון...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "קבל"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "שלח"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "הלחן"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "פרטיות"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "פרוקסי"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "שם חשבון"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "קבע כחשבון שגרתי"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "מידע אישי"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "שם מלא"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "כתובות דואר"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "‎ארגון‎"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "מידע שרת"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "חדשות (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "אין (מקומי)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "שרת זה מצריך אימות"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "שרת חדשות"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "שרת לקבלה"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "שרת SMTP (שליחה)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "מזהה משתמש"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "סיסמה"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "השתמש באימות מאובטח (APOP)"
 
 # בעת במועד קבלה
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "הסר הודעות שעל שרת לאחר קבלה"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "הסר כעבור"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "ימים"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 ימים : הסר מידית"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "הורד את כל ההודעות (כולל אלה שכבר נתקבלו) שעל שרת"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "מגבלת גודל לקבלה"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "ק״ב"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "סנן הודעות בעת קבלה"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "תיבת דואר נכנס שגרתית"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "הודעות לא מסוננות יאוחסנו בתוך תיקייה זו."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "שיטת אימות"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "אוטומטית"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "בדוק INBOX רק בעת קבלה"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "סנן הודעות חדשות בתוך INBOX בעת קבלה"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "חדשות"
 
 # פריטים
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "מספר מרבי של מאמרים להורדה"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "בלי הגבלה אם 0 מצוין."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "'השג הכל' בודק עבור הודעות חדשות בחשבון זה"
 
 # כותר
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "תקורה"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "הוסף שדה תקורת תאריך"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "הפק Message-ID"
 
 # שמוגדרת לפי משתמש
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "הוסף תקורה מוגדרת-משתמש"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " ערוך... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "אימות"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "אימות SMTP ‫(SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4631,242 +4661,246 @@ msgstr ""
 "כאשר ערכים אלו יישארו ריקים, ייעשה שימוש באותו מזהה משתמש ובאותה סיסמה אשר "
 "משמשים לצורך קבלה."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "אמת עם POP3 טרם שליחה"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "חתום"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "פלט ישיר"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "שם:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "פלט פקודה"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "השם חתימה לפני ציטטה (לא מומלץ)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "הגדר אוטומטית את הכתובות הבאות"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "‎עותק‎"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "‎עותק-סמוי‎"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "‎מענה-אל‎"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "חתום הודעות בעזרת PGP באופן שגרתי"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "הצפן הודעות בעזרת PGP באופן שגרתי"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "הצפן בעת מענה להודעה מוצפנת"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 msgid "Add my own key to the recipients list on encryption"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "השתמש בפורמט ASCII-armored לצורך הצפנה"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "השתמש בחתימת טקסט צלול"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr "מפתח חתימה / הצפנה"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "השתמש במפתח GnuPG ברירת מחדל"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "בחר מפתח לפי כתובת הדוא״ל שלך"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "ציין מפתח ידנית"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "משתמש או מזהה מפתח:"
 
 # לא לעשות שימוש בהצפנת
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "אל תשתמש בהצפנת SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור POP3"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "השתמש בפקודת STARTTLS כדי להתחיל סשן SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור IMAP4"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור NNTP"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "שליחה (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "השתמש בהצפנת SSL עבור חיבור SMTP"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "השתמש בהצפנת SSL לא חוסמת (non-blocking)"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "כבה את העדפה זו אם קיימות אצלך בעיות בחיבור SSL."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "השתמש בפרוקסי SOCKS"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "שם מארח:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "פורט:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "השתמש באימות"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "שם:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "השתמש בפרוקסי SOCKS בשליחה"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "ציין פורט SMTP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "ציין פורט POP3"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "ציין פורט IMAP4"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "ציין פורט NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "ציין שם מתחם"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "מדור שרת IMAP"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "רק תתי תיקיות של ספרייה זו תוצגנה."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "טהר כל מטמוני הודעות בעת יציאה"
 
 # השמת
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "השם הודעות שנשלחו בתוך"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "השם הודעות טיוטה בתוך"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "השם הודעות בהמתנה בתוך"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "השם הודעות מחוקות בתוך"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "שם חשבון אינו מוזן."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "כתובת דואר אינה מוזנת."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "שרת SMTP אינו מוזן."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "מזהה משתמש לא מוזן."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "שרתPOP3 אינו מוזן."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "שרת IMAP4 אינו מוזן."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "שרת NNTP אינו מוזן."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "התיקייה המצוינת איננה תיקיית תור."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/hr.po b/po/hr.po
index 0d0d0686..6334fafc 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2013-08-09 08:34+0100\n"
 "Last-Translator: Hasan Osmanagić <hasan.osmanagic@zg.t-com.hr>\n"
 "Language-Team: Hasan Osmanagić <hasan.osmanagic@zg.t-com.hr>\n"
@@ -25,202 +25,207 @@ msgstr "Filtar smeća (ručno)"
 msgid "Junk mail filter"
 msgstr "Filtar smeća"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 veza s %s je pukla. Spajam ponovo...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP poslužitelj onemogućuje PRIJAVU.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "Ne mogu se povezati s IMAP4 poslužiteljem.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Ne mogu pokrenuti TLS sesiju.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "postavljane zastavica)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "Uzimam poštu %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Nastavljam poštu za %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Premještam poštu %s u %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram poruke %s u %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Uklanjam poštu s %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne mogu postaviti zastavicu obrisano: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "ne mogu obrisati\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Premještam svu poštu u %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne mogu postaviti zastavice obrisano: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "ne mogu zatvoriti mapu\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "mapa %s ne postoji ili niste spojeni na Internet.\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "greška pri dobivanju POPISA.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "ne mogu stvoriti '%s'\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "ne mogu stvoriti '%s' u pretincu ulazne pošte\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne mogu stvoriti pretinac: POPIS nije uspio\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "ne mogu stvoriti pretinac\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "ne mogu stvoriti pretinac\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne mogu preimenovati pretinac: %s to %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "ne mogu obrisati pretinac\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Primam poštu (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "greška pri dobivanju kuverte.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati kuvertu: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "ne mogu dobiti kuvertu\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 poslužiteljem: %s%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne mogu održati vezu s IMAP4 poslužiteljem: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti prostor naziva\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu označiti mapu: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "greška pri IMAP naredbi: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autorizacija nije uspjela.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 prijava nije uspjela.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu nastaviti %s to %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(šaljem datoteku)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu nastaviti poštu za %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %s u %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "greška pri IMAP naredbi: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška pri IMAP naredbi: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "greška pri IMAP naredbe: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "ne mogu pretvoriti UTF-7 u %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "ne mogu pretvoriti %s u UTF-7\n"
@@ -496,7 +501,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "greška pri POP3 sesiji\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "greška pri upisu postavki u datoteku\n"
@@ -548,50 +553,50 @@ msgstr "krivi SMTP odgovor\n"
 msgid "error occurred on SMTP session\n"
 msgstr "greška pri SMTP sesiji\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 nije dostupan\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 dostupan\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 nije dostupan\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 dostupan\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "SSL način nije dostupan\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Nepoznat SSL način *BUG PROGRAMA*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Greška pri stvaranju SSL sadržaja\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL veza koristeći %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Certifikat poslužitelja:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Tema: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Izdavač: %s\n"
@@ -650,7 +655,7 @@ msgstr ""
 "ne Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA "
 "02111-1307, SAD."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -688,14 +693,14 @@ msgstr ""
 "sve'."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Naziv"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -823,13 +828,13 @@ msgstr "Radnja s korisnikovim argumentom"
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Adresar"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Bilješke"
 
@@ -841,7 +846,7 @@ msgstr "Odaberite mapu adresara"
 msgid "Auto-registered address"
 msgstr "Auto-registrirane e-adrese"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -862,10 +867,10 @@ msgstr "/_Datoteka/Novi _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _LDAP poslužitelj"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
@@ -882,21 +887,21 @@ msgstr "/_Datoteka/_Obriši"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Pohrani"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Uređivanje"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Uređivanje/_Kopiraj"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Uređivanje/_Zalijepi"
 
@@ -940,7 +945,7 @@ msgstr "/_Adresa/_Uređivanje"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -953,12 +958,12 @@ msgstr "/_Datoteka/Unesi _LDIF datoteku"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Alati/Unesi _CSV datoteku"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O Sylpheed-u"
@@ -976,7 +981,7 @@ msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1018,7 +1023,7 @@ msgstr "Adresar"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Mapa"
 
@@ -1030,17 +1035,17 @@ msgstr "E-adresa"
 msgid "Search:"
 msgstr "Potraga:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Cc (kopija):"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Bcc (na znanje):"
@@ -1240,7 +1245,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Napomena"
 
@@ -1296,392 +1301,397 @@ msgstr "Smeđa"
 msgid "None"
 msgstr "Ništa"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Otvori"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Dodaj..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Ukloni"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Slanje"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Datoteka/Pošalji _kasnije"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Datoteka/Pohrani u pretinac _nedovršeno"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Datoteka/Pohrani i _zadrži"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Datoteka/_Priloži datoteku"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Datoteka/_Umetni datoteku"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datoteka/_Umetni _potpis"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Datoteka/Dodaj _potpis"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Uređivanje/_Poništi"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Uređivanje/_Vrati"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Uređivanje/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Uređivanje/_Odreži"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uređivanje/Zalijepi s _navodnicima"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Uređivanje/Označi _sve"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uređivanje/Pre_lomi poglavlje"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uređivanje/Prelomi retke"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Uređivanje/_Auto prelom retka"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Mogućnosti"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Mogućnosti/_Za"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Mogućnosti/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Mogućnosti/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/_Mogućnosti/_Odgovor"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Mogućnosti/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/_Mogućnosti/Prema _gore"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Mogućnosti/_Ravnalo"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Mogućnosti/_Prilog"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Mogućnosti/Prilagodba _alatne trake"
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Mogućnosti/_Kodiranje znakova"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Mogućnosti/_Kodiranje znakova/_Automatic"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Mogućnosti/_Kodiranje znakova/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Western European (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Western European (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Central European (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Baltic (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Greek (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Arabic (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Arabic (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Hebrew (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Hebrew (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Cyrillic (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Cyrillic (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Simplified Chinese (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Traditional Chinese (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Korean (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Alati/_Adresar"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Alati/_Predložak"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Alati/_Radnja"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Alati/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Alati/Uređivanje s _vanjskim uređivačem"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Alati/Zahtjev _obavijesti o uvidu"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Alati/PGP po_tpis"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Alati/PGP _kripcija"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Alati/_Provjera pravopisa"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Alati/_Postava jezika"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne postoji\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti dio tekst\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Greška formata citata."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Greška oblika pri odgovor/proslijedi."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna"
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "ne mogu učitati %s"
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedijelne poruke."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Potpis"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Nema teme"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Nema teme! Poslati tako?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Nedostaje prilog"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Nedostaje prilog! Poslati bez priloga?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Provjera primatelja"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Poslati poštu na slijedeće adrese?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "_Slanje"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
@@ -1689,11 +1699,11 @@ msgstr ""
 "Provjera ima li pošte je u toku.\n"
 "Molim, pokušajte kasnije."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti popis primatelja."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1701,39 +1711,39 @@ msgstr ""
 "E-adresa slanja nije određena.\n"
 "Molim, odaberite e-adresu prije slanja."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške pri slanju pošte %s -u."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr "Slanje pošte je završeno, ali kopija neće biti pohranjena u Poslano."
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nema pridruženog ključa odabranom ključu oznake `%s'."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "Ne mogu potpisati poštu."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "Ne mogu kodirati poštu."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "Ne mogu potpisati ili kodirati poštu."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "ne mogu promijeniti oblik datoteke\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1744,11 +1754,11 @@ msgstr ""
 "\n"
 "Poslati %s ipak?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Greška pri pretvorbi"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1761,15 +1771,15 @@ msgstr ""
 "\n"
 "Ipak poslati?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Granična duljina retka"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Kriptiraj s Bcc"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1782,94 +1792,104 @@ msgstr ""
 "\n"
 "Ipak poslati?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poštu\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "Stavljam poštu na čekanje...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "ne mogu naći pretinac Čekanje: %s\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "ne mogu staviti poštu na čekanje\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Stvaram okno za pisanje ...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "PGP potpis"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "PGP kriptiranje"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Oblik podataka"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Potpis"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Pro_vjera potpisa"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Naziv datoteke"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "Datoteka ne postoji"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Otvaram izvršnu datoteku"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1880,12 +1900,12 @@ msgstr ""
 "Ako ju ipak želite pokrenuti, prvo ju pohranite negdje  i provjerite ne "
 "sadrži li virus ili neki zločesti program."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za vanjski uređivač je kriva: `%s'\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1894,48 +1914,48 @@ msgstr ""
 "Vanjski uređivač još uvijek radi.\n"
 "Gasim proces(pid: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "_Prilagodba trake alata"
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Ne mogu staviti poruku na čekanje."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Pohrani poštu"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova pošta je izmijenjena! Pohraniti je u Nedovršeno?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Zatvori bez pohrane"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Primijeniti predložak `%s' ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Primijeni predložak"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Zamijeni"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Umetni"
 
@@ -1976,7 +1996,7 @@ msgid "Nick Name"
 msgstr "Nadimak"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-adresa"
 
@@ -2034,7 +2054,7 @@ msgid " Check File "
 msgstr " Provjeri datoteku "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Datoteka"
 
@@ -2042,62 +2062,62 @@ msgstr "Datoteka"
 msgid "Add New Address Book"
 msgstr "Dodaj novi Adresar"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Naziv grupe mora biti unesen."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Uređivanje grupe"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Naziv  grupe"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Dostupne adrese"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Adrese u grupi"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Pomaknite E-adrese prema ili od grupe sa strelicama"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Uređivanje pojedinosti grupe"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Dodaj novu grupu"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Uređivanje mape"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Unos naziva novog pretinca:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Novi pretinac"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Unos naziva novog pretinca:"
 
@@ -2114,7 +2134,7 @@ msgid "Edit JPilot Entry"
 msgstr "Uređivanje JPilot unosa"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr "/_Mogućnosti/_Kodiranje znakova"
@@ -2179,7 +2199,7 @@ msgstr "Stanka (sek)"
 msgid "Maximum Entries"
 msgstr "Najviše unosa"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -2265,7 +2285,7 @@ msgid "MH (number only)"
 msgstr "MH (samo broj)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Odabir... "
 
@@ -2446,12 +2466,12 @@ msgstr "Postavke info pretinca...\n"
 msgid "Setting folder info..."
 msgstr "Postavke info pretinca..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem pretince %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem pretinac %s ..."
@@ -3268,682 +3288,692 @@ msgstr ""
 "Postoji stari zapis postavki.\n"
 "Preseliti ga?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Pretinac"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Pretinac/Stvori _novi pretinac..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Pretinac/_Preimenuj pretinac..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datoteka/_Pretinac/Pre_mjesti pretinac..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Pretinac/_Obriši pretinac"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/_Sandučić mapa"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/_Sandučić mapa/Dodaj _sandučić mapu..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Datoteka /_Sandučić mapa/_Ukloni sandučić mapu"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Sandučić mapa/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Datoteka/_Sandučić mapa/_Ima li nove pošte"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Datoteka/_Sandučić mapa/Ima li nove pošte u _svim sandučićima"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Datoteka/_Sandučić mapa/O_svježi pretince"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_Datoteka/_Uvoz pošte"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_Datoteka/I_zvoz pošte..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Datoteka/Isp_razni koš"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/Pohrani _kao..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Datoteka/Post_ava stranice..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/_Ispiši..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Datoteka/Rad iz_van mreže"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/I_zlaz"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Uređivanje/Označi _niz"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Uređivanje/Prona_đi u ovoj pošti"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/:Uređivanje/_Traži poštu..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/_Uređivanje/_Brza pretraga"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Mogućnosti/Prikaži _ili sakrij"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Mogućnosti/Prikaži _ili sakrij/P_retince"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Mogućnosti/Prikaži _ili sakrij/_Okno pošte"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Mogućnosti/Prikaži _ili sakrij/_Traka alata"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Mogućnosti/Prikaži _ili sakrij/_Traka alata/_Ikone i tekst"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Mogućnosti/Prikaži _ili sakrij/_Traka alata/Tekst i _desnu ikonu"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Mogućnosti/Prikaži _ili sakrij/_Traka alata/_Ikone"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Mogućnosti/Prikaži _ili sakrij/_Traka alata/_Tekst"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Mogućnosti/Prikaži _ili sakrij/_Traka alata/_Ništa"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Mogućnosti/Prikaži _ili sakrij/_Traka alata/Traka _pretraga"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Mogućnosti/Prikaži _ili sakrij/_Traka alata/Traka stat_usa"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Mogućnosti/_Prilagodba trake alata..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/_Mogućnosti/Iz_gled"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Mogućnosti/Iz_gled/U_običajeno"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/_Mogućnosti/Iz_gled/_Okomito"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Mogućnosti/Zaseban pregled p_retinaca"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Mogućnosti/_Zaseban pregled pošte"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Mogućnosti/_Sortiranje"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Mogućnosti/_Sortiranje/po _broju"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Mogućnosti/_Sortiranje/po _veličini"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Mogućnosti/_Sortiranje/po _datumu"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Mogućnosti/_Sortiranje/_niza po datumu"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Mogućnosti/_Sortiranje/po po_šiljatelju"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Mogućnosti/_Sortiranje/po p_rimatelju"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Mogućnosti/_Sortiranje/po _temi"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Mogućnosti/_Sortiranje/po _boji oznaka"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Mogućnosti/_Sortiranje/po _oznaci"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Mogućnosti/_Sortiranje/po _nepročitano"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Mogućnosti/_Sortiranje/po _prilogu"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Mogućnosti/_Sortiranje/_Nesortirano"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Mogućnosti/_Sortiranje/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Mogućnosti/_Sortiranje/Uzlazno"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Mogućnosti/_Sortiranje/Silazno"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Mogućnosti/_Sortiranje/po _temi"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Mogućnosti/_Pregled niza"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Mogućnosti/_Raširi sve nizove"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Mogućnosti/Zatvori _nizove"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Mogućnosti/Prikaži _stavku..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Mogućnosti/_Idi u"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Mogućnosti/_Idi u/_Prethodna pošta"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Mogućnosti/_Idi u/Sli_jedeća pošta"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Mogućnosti/_Idi u/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Mogućnosti/_Idi u/Pregled _nepročitane pošte"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Mogućnosti/_Idi u/_Slijedeća nepročitana pošta"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Mogućnosti/_Idi u/_Prethodna nepročitana pošta"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Mogućnosti/_Idi u/Slij_edeća nova pošta"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Mogućnosti/_Idi u/Pregled _označene pošte"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Mogućnosti/_Idi u/Slijedeća _označena pošta"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Mogućnosti/_Idi u/Prethodna _obilježena pošta"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Mogućnosti/_Idi u/_Slijedeća _obilježena pošta"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Mogućnosti/_Idi u/Drugi p_retinac..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Mogućnosti/_Kodiranje znakova/_Auto detect"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Western European (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Japanese (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Mogućnosti/_Kodiranje znakova/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Mogućnosti/Otvori u novom _oknu"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Mogućnosti/Izvor poruk_e"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/_Mogućnosti/Po_jedinosti zaglavlja"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Mogućnosti/_Osvježi panel popisa pošte"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/Poš_ta"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/Poš_ta/Pre_uzmi"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Poš_ta/Pre_uzmi/poštu s _osnovne e-adrese"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Poš_ta/Pre_uzmi/poštu sa _svih e-adresa"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/Poš_ta/Pre_uzmi/Pre_kini"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/Poš_ta/Pre_uzmi/poštu iz _svih sandučića"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/Poš_ta/Pre_uzmi/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/Poš_ta/Pošalji poštu iz _Čekanje"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/Poš_ta/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/Poš_ta/Pisanje _nove poruke"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/Poš_ta/Odgovo_r"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/Poš_ta/Odgovo_r"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Poš_ta/Odgovo_r/_svima"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Poš_ta/Odgovo_r/_pošiljatelju"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Poš_ta/Odgovo_r/svima s p_opisa"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/Poš_ta/Prosli_jedi"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/Poš_ta/Proslijedi _kao prilog"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/Poš_ta/Pre_usmjeri"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/Poš_ta/Pre_mjesti..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/Poš_ta/Kopir_aj..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/Poš_ta/O_znači"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/Poš_ta/O_znači/_Označi zastavicom"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/Poš_ta/O_znači/_Ukloni zastavicu"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/Poš_ta/O_znači/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Poš_ta/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Poš_ta/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Poš_ta/O_znači/Označi _niz kao pročitano"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Poš_ta/O_znači/Označi _sve pročitano"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/Poš_ta/O_briši"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/Poš_ta/Označi kao _smeće"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Poš_ta/Označi, nije sme_će"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/Poš_ta/Pre_uređivanje"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Alati/Dod_aj pošiljatelja u adresar..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Alati/_Filtriraj poštu"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Alati/_Filtriraj označenu poštu"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Alati/_Pravilo filtriranja"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Alati/_Pravilo filtriranja/_Automatski"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Alati/_Pravilo filtriranja/prema _Od"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Alati/_Pravilo filtriranja/prema _Za"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Alait/_Pravilo filtriranja/prema temi"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Alati/Filtriraj _smeće poštu u Smeće"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Alati/Filtriraj smeće u _označenoj pošti"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Alati/_Obriši duplu poštu"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Alati/Pove_ži odvojenu poštu"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Alati/Izvrši označene procese"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Alati/Filtriraj _smeće poštu u Smeće"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Alati/_Filtriraj poštu"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Alati/Okno zapisa"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Postavke"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Postavke/_Opće postavke..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Postavke/Postavke _filtara..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Postavke/_Predložak..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Postavke/_Radnje..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Postavke/_Upravitelj dodacima..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Postavke/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Postavke/Postavke ove _e-adrese..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Postavke/Stvori _novu e-adresu..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Postavke/_Uređivanje e-adresa..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Postavke/_Koristi ovu e-adresu..."
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_Česta pitanja"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_Česta pitanja/_Engleski"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_Česta pitanja/_Njemački"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_Česta pitanja/_Španjolski"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoć/_Česta pitanja/_Francuski"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_Česta pitanja/_Talijanski"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Pomoć/_Naredbeni redak"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/_Pomoć/Ima li _dogradnja..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/_Pomoć/_Ima li dogradnja dodataka..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Stvaram glavno okno...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavno okno: dodjela boje %d nije uspjela\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Bez naziva"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Odspojen"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Vi niste spojeni. Spojiti se?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Isprazni Koš"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti svu poštu iz koša?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Dodaj sandučić mapu"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3953,16 +3983,16 @@ msgstr ""
 "Ako unesete postojeći sandučić,\n"
 "on će biti automatski pretražen."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3971,95 +4001,95 @@ msgstr ""
 "Stvaranje sandučića nije uspjelo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u mapi."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Pregled pretinaca"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Pregled pošte"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/Odgovo_r"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Odgovor _svima"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Odgovor _pošiljatelju"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor svi_ma s popisa"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Pre_usmjeri"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Ikone _i text"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Tekst s _desne strane ikone"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "_Ikone"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_Tekst"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_Ništa"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Vi niste spojeni. Kliknite na ikonu da se spojite."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Vi ste spojeni. Kliknite na ikonu za odspajanje."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Izlaz iz programa?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "Označena pošta se ne može kombinirati."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Odaberite pretinac"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Mogućnosti naredbenog retka."
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: sylpheed [MOGUĆNOST]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4093,7 +4123,7 @@ msgstr ""
 "--pomoć\n"
 "--inačica"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4127,15 +4157,15 @@ msgstr ""
 "prikaz pomoći i izlaz\n"
 "Prikaz info inačice i izlaz"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Mogućnost amo za Windows:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "unos porta IPC udaljenih naredbi"
 
@@ -4368,478 +4398,482 @@ msgstr "Datoteka:"
 msgid "Description: "
 msgstr "Opis:"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Otvaram okno za postavke e-adrese...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "E-adresa%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Postavke za novu e-adresu"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Postavke e-adrese"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Otvaran okno za postavki e-adresa...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Primanje"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Slanje"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Pisanje"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Privatnost"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Naziv ove e-adrese"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Postavi kao standardni"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Osobne informacije"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Puni naziv"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "E-adresa"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Informacije o poslužitelju"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Ništa (lokalno)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Ovaj server zahtijeva autorizaciju"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "News poslužitelj"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Poslužitelj za primanje"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "SMTP poslužitelj (slanje)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "ID korisnika"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Lozinka"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Koristi autorizaciju (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Ukloni iza"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "dani"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 dana: ukloni odmah"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Preuzmi svu poštu (i onu već preuzetu) s poslužitelja"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Ograničenje preuzimanja"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Standardni pretinac ulazne pošte"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrirane poruke biti će spremljene u ovaj pretinac)"
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Način autorizacije"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automatski"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Pri preuzimanju provjeri samo INBOX "
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtriraj poštu pri preuzimanju"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Novosti"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksimalni broj članaka za skidanje\n"
 "(0 je neograničeno)"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Bez ograničenja ako je unesena 0."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Sve' preuzima novu poštu sa svih e-adresa"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Dodaj polje Datum u zaglavlje"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Generiraj ID poruke"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Dodaj korisnikova zaglavlja"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Uređivanje... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Autorizacija"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autorizacija (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "Ako nema unosa, koristit će se ista korisnikova ID i lozinka."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Autoriziraj s POP3 prije slanja"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Potpis"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Izravni unos"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Naziv"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Naredba izlaza"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Stavi potpis prije navodnika (ne preporuča se)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automatski postavi slijedeće adrese"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Cc(kopija)"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Bcc(na znanje)"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Odgovor-Za"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "PGP potps, standard"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "PGP kripcija, standard"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Kriptiraj kad odgovaram na kriptiranu poštu"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "ne mogu dobiti popis primatelja."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Koristi ASCII-ojačani oblik kripcije"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Koristi tekst potpis"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Koristi standardni GnuPG ključ"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Odaberi ključ po e-adresi"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Ručni unos ključa"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "korisnik ili ID ključ:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Ne koristi SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Koristi SSL za POP3 veze"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Koristi STARTTLS naredbu za pokretanje SSL-a"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Koristi SSL za IMAP4 veze"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Koristi SSL za SMTP veze"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Slanje (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Koristi SSL za SMTP veze"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Koristi neblokirani SSL"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Uklonite kvačicu ako imate problema sa SSL vezom."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "Koristi SOCKS proxy"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Naziv domaćina"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Port:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Koristi autorizaciju"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Naziv"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Lozinka"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Koristi SOCKS proxy pri slanju"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Unesite SMTP port"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Unesite POP3 port"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Unesite IMAP4 port"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Unesite NNTP port"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Unesite naziv domene"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP poslužiteljeva mapa"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Prikaz pretinaca samo ove mape."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Pri izlazu obriši svu poštu iz predmemorije."
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Spremi poslanu poštu u"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Stavi skice pošte u"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Stavi poštu na čekanju u"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Stavi obrisanu poštu u"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "E-adresa nije unesena."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "E-adresa nije upisana."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "SMTP poslužitelj nije unesen."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "ID korisnika nije upisan."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "POP3 poslužitelj nije unesen."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 poslužitelj nije unesen."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "NNTP poslužitelj nije unesen."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Ovaj pretinac nije 'Čekanje'."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/hu.po b/po/hu.po
index 8796d85b..eac2f059 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2013-09-19 20:54+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@uhuklub.hu>\n"
 "Language-Team: Hungarian <NONE>\n"
@@ -29,202 +29,207 @@ msgstr "Levélszemét szűrés (kézi)"
 msgid "Junk mail filter"
 msgstr "Levélszemét szűrés"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Az IMAP4 kapcsolat %s felé megszakadt. Újrakapcsolódás...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Az IMAP4 szerveren LOGIN kikapcsolva.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "Nem lehet IMAP kapcsolatot létesíteni.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d IMAP4 kapcsolat létrehozása ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Nem lehet TLS menetet indítani.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(FLAG-ek letöltése...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "%u levél letöltése"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Levelek hozzáfűzése ide: %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "%s levél áthelyezése ide: %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "%s levél másolása ide: %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "%s levél eltávolítása"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nem lehet beállítani a törölt jelzést: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "nem lehet törölni\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Minden levél törlése ebből: %s?"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nem lehet beállítani a törölt jelzést: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "mappa bezárása nem sikerült\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s gyökérmappa nem létezik\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "hiba történt a LIST lekérdezése közben.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s' nem hozható létre\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "'%s' nem hozható létre a BEJÖVŐ mappában\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nem lehet létrehozni postaládát: LIST sikertelen\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "nem lehet létrehozni postaládát\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "nem lehet létrehozni postaládát\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nem lehet a postaládát átnevezni: %s -> %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "nem lehet törölni a postaládát\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Levélfejlécek letöltése (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "hiba történt a boríték fogadása közben.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nem lehet értelmezni a borítékot: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "a borítékot nem lehet megszerezni\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 szerverhez nem lehet kapcsolódni\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 szerverhez nem sikerült kapcsolódni: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "névtér nem elérhető\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "%s mappát nem lehet kiválasztani\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "hiba az IMAP parancs közben: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "Az IMAP4 azonosítás nem sikerült.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 bejelentkezés sikertelen.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s nem fűzhető hozzá ehhez: %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(fájl küldése...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "levél nem fűzhető hozzá ehhez: %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s nem másolható ide: %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "hiba az IMAP parancs közben: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "hiba az IMAP parancs közben: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "hiba az IMAP parancs közben: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "az iconv nem tud UTF-7-ből konvertálni ebbe: %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "az iconv nem tudja UTF-7-re konvertálni ezt: %s\n"
@@ -500,7 +505,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "hiba történt a POP3 kapcsolat közben\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "a beállításokat nem lehetett elmenteni\n"
@@ -552,50 +557,50 @@ msgstr "hibás SMTP válasz\n"
 msgid "error occurred on SMTP session\n"
 msgstr "hiba történt az SMTP kapcsolat közben\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 nem elérhető\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 elérhető\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 nem elérhető\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 elérhető\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "SSL eljárás nem elérhető\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Ismeretlen SSL eljárás *PROGRAM HIBA*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Hiba az ssl környezet létrehozása közben\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL kapcsolat %s használatával\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Szerver igazolvány:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Tárgy: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Szerző: %s\n"
@@ -656,7 +661,7 @@ msgstr ""
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. http://www."
 "fsf.org "
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -694,14 +699,14 @@ msgstr ""
 "funkció bekapcsolásához tegyen pipát a 'G' oszlopban levő négyzetbe!"
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Név"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -830,13 +835,13 @@ msgstr "A művelet felhasználói paramétere"
 msgid "Add Address to Book"
 msgstr "Cím hozzáadása a címjegyzékhez"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Cím"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Megjegyzések"
 
@@ -848,7 +853,7 @@ msgstr "Címjegyzék mappa választás"
 msgid "Auto-registered address"
 msgstr "Auto-regisztrált cím"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Fájl"
@@ -869,10 +874,10 @@ msgstr "/_Fájl/Új _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fájl/Új _LDAP Szerver"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Fájl/---"
@@ -889,21 +894,21 @@ msgstr "/_Fájl/_Törlés"
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/S_zerkesztés"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/S_zerkesztés/_Másolás"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/S_zerkesztés/_Beillesztés"
 
@@ -947,7 +952,7 @@ msgstr "/_Cím/_Szerkesztés"
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Eszközök"
@@ -960,12 +965,12 @@ msgstr "/_Eszközök/_LDIF fájl importálása"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Eszközök/_CSV fájl importálása"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
@@ -983,7 +988,7 @@ msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1025,7 +1030,7 @@ msgstr "Címjegyzék"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Mappa"
 
@@ -1037,17 +1042,17 @@ msgstr "Email cím"
 msgid "Search:"
 msgstr "Keresés:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Címzett:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Titkos másolat:"
@@ -1252,7 +1257,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1308,392 +1313,397 @@ msgstr "Barna"
 msgid "None"
 msgstr "Semmi"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Megnyitás"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Hozzáadás..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Eltávolítás"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Tulajdonságok..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Fájl/_Küldés"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Fájl/Kü_ldés később"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fájl/Mentés a _Vázlatok mappába"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fájl/Mentés és _szerkesztésben marad"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Fájl/Fájl _csatolása"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Fájl/Fájl _beszúrása"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fájl/_Aláírás beszúrása"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Fájl/Aláírás csa_tolása"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/S_zerkesztés/_Visszavonás"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/S_zerkesztés/_Ismétlés"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/S_zerkesztés/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/S_zerkesztés/_Kivágás"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/S_zerkesztés/Beillesztés idé_zetként"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/S_zerkesztés/Mi_ndet kijelöli"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/S_zerkesztés/Aktuális bekez_dés törése"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/S_zerkesztés/Minden hosszú _sor törése"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/S_zerkesztés/A_utomata tördelés"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Nézet"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Nézet/_Címzett"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Nézet/_Másolat"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Nézet/_Titkos másolat"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/_Nézet/_Válaszcím"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Nézet/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/_Nézet/Vá_laszcikk-cím"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Nézet/V_onalzó"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Nézet/C_satolás"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Nézet/Es_zközsáv testreszabása..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Nézet/_Karakterkódolás"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Nézet/_Karakterkódolás/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Nézet/_Karakterkódolás/7 bites ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Nézet/_Karakterkódolás/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Nézet/_Karakterkódolás/Közép-Európai (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Nézet/_Karakterkódolás/_Baltikumi (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Nézet/_Karakterkódolás/Görög (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Nézet/_Karakterkódolás/Arab (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Nézet/_Karakterkódolás/Arab (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Nézet/_Karakterkódolás/Török (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/_Sablon"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/_Műveletek"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Eszközök/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Eszközök/Szerkesztés _külső programmal"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Eszközök/Request _disposition ntoification"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Eszközök/PGP _Aláírás"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Eszközök/PGP _Titkosítás"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Eszközök/_Helyesírásellenőrzés"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Eszközök/Helyesírás _nyelvi beállítások"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fájl nem létezik\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Nem tudtam olvasni a szövegrészt\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Levél válasz/továbbítás formátumhiba."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s fájl nem létezik\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem határozható meg\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "A(z) %s fájl üres."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Levél: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Egy több részes levél egy darabja nem hozzáférhető."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Levél írása%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Aláírás"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Nincs címzett megadva."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Nincs tárgy"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldi?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Nincs csatolva semmi"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Nincs csatolva semmi. Elküldi csatolások nélkül?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Címzettek ellenőrzése"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Tényleg elküldi ezt a levelet a következő címekre?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Tárgy:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "_Küldés"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
@@ -1701,11 +1711,11 @@ msgstr ""
 "Új levelek lekérése folyamatban van.\n"
 "Próbálja újra később."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1713,12 +1723,12 @@ msgstr ""
 "Nincs megadva fiók a levél küldéshez.\n"
 "Válasszon ki egy fiókot küldés előtt!"
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba lépett fel %s-n{ae}k küldendő levél küldésekor."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
@@ -1726,30 +1736,30 @@ msgstr ""
 "A levél küldése megtörtént, de a levél tartalma nem lett elmentve a Kimenő "
 "mappába."
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nem található hozzárendelt kulcs ehhez a kiválasztott kulcs azonosítóhoz: `"
 "%s'."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "A levelet nem sikerült aláírni."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "A levelet nem sikerült titkosítani."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "A levelet nem sikerült titkosítani vagy aláírni."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1760,11 +1770,11 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi, mint %s?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1777,15 +1787,15 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Titkos másolat(ok) titkosítása"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1800,94 +1810,104 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "a régi levelet nem lehet törölni\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "levél Várakozó sorba rakása...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "A levelet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "A(z) %s fájl nem létezik."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "A(z) %s fájlt nem lehet megnyitni."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Dátum típusa"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Aláírás"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Digitális aláírás ellenőrzése"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "A fájl nem létezik."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Futtatható fájl megnyitása"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1899,12 +1919,12 @@ msgstr ""
 "Ha futtatni szeretné, mentse el valahová, és győződjön meg róla, hogy nem "
 "egy vírus vagy más kártékony program."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1913,48 +1933,48 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "Eszközs_áv testreszabása..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "A levelet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Levél mentése"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "A levél megváltozott. Menti a Vázlatok mappába?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -1995,7 +2015,7 @@ msgid "Nick Name"
 msgstr "Becenév"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Email cím"
 
@@ -2053,7 +2073,7 @@ msgid " Check File "
 msgstr " Fájl ellenőrzése"
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Fájl"
 
@@ -2061,62 +2081,62 @@ msgstr "Fájl"
 msgid "Add New Address Book"
 msgstr "Új címjegyzék hozzáadása"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Egy csoportnevet meg kell adnia."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Csoportadatok szerkesztése"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Csoportnév"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Elérhető címek"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Címek a csoportban"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Email címek mozgatása csoportból vagy csoportba a nyilakkal"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Csoport tulajdonságainak szerkesztése"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Új csoport hozzáadása"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Mappa szerkesztése"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "A mappa új neve:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Új mappa"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Az új mappa neve:"
 
@@ -2133,7 +2153,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot bejegyzés szerkesztése"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2198,7 +2218,7 @@ msgstr "Időtúllépés (mp)"
 msgid "Maximum Entries"
 msgstr "Maximális bejegyzések"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Alap"
 
@@ -2284,7 +2304,7 @@ msgid "MH (number only)"
 msgstr "MH (csak szám)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Kiválaszt... "
 
@@ -2465,12 +2485,12 @@ msgstr "Mappa információ beállítása...\n"
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
@@ -3291,682 +3311,692 @@ msgstr ""
 "Az előző verzió konfigurációja megtalálva.\n"
 "Szeretné migrálni azokat?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Fájl/_Mappa"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fájl/_Mappa/Ú_j mappa létrehozása..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fájl/_Mappa/Mappa át_nevezése..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fájl/_Mappa/Mappa át_helyezése..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fájl/_Mappa/Mappa _törlése"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Fájl/_Postaláda"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fájl/_Postaláda/Postaláda _hozzáadása..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fájl/_Postaláda/Postaláda _eltávolítása"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fájl/_Postaláda/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fájl/_Postaláda/Ú_j levelek ellenőrzése"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fájl/_Postaláda/Ú_j levelek ellenőrzése az összes postaládában"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fájl/_Postaláda/_Mappafa újraépítése"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_Fájl/_Levéladatok importálása..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_Fájl/L_evéladatok exportálása..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Fájl/_Kuka ürítése"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Fájl/_Mentés másként..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Fájl/_Oldalbeállítás..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Fájl/_Nyomtatás..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Fájl/Ka_pcsolat nélküli munka"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Fájl/Ki_lépés"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/S_zerkesztés/S_zál kiválasztása"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/S_zerkesztés/_Keresés az aktuális levélben..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/S_zerkesztés/Le_velek keresése..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/S_zerkesztés/_Gyorskeresés"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Nézet/_Megjelenít vagy elrejt"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/Mappa_fa"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Levélnézet"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/Ikon és Szöveg"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Szöveg az ikontól jobbra"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Ikon"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Szöveg"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/Se_mmi"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Keresősáv"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/Á_llapotsáv"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Nézet/Eszközs_áv testreszabása..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/_Nézet/Elren_dezés"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Nézet/Elren_dezés/_Vízszintes"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/_Nézet/Elren_dezés/_Függőleges"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Nézet/_Külön mappafa"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Nézet/Külön le_vélnézet"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Nézet/_Rendezés"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Nézet/_Rendezés/_Szám szerint"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Nézet/_Rendezés/_Méret szerint"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Nézet/_Rendezés/_Dátum szerint"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Nézet/_Rendezés/_Szál dátuma szerint"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Nézet/_Rendezés/_Feladó szerint"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Nézet/_Rendezés/_Címzett szerint"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Nézet/_Rendezés/_Tárgy szerint"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Nézet/_Rendezés/S_zínes címke szerint"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Nézet/_Rendezés/_Jelölés szerint"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Nézet/_Rendezés/_Olvasatlan szerint"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Nézet/_Rendezés/Cs_atolás szerint"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Nézet/_Rendezés/Nem _rendez"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Nézet/_Rendez/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Nézet/_Rendezés/_Növekvő"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Nézet/_Rendezés/_Csökkenő"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Nézet/_Rendezés/_Tárgyhoz vonz"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Nézet/Szá_lankénti nézet"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Nézet/_Minden szál kifejtése"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Nézet/_Minden szál bezárása"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Nézet/K_ijelzett cikk beállítás..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Nézet/_Ugrás"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Nézet/_Ugrás/_Előző levélhez"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Nézet/_Ugrás/_Következő levélhez"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Nézet/_Ugrás/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Nézet/_Ugrás/_Előző olvasatlan levélhez"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Nézet/_Ugrás/_Következő olvasatlan levélhez"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Nézet/_Ugrás/_Előző új levélhez"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Nézet/_Ugrás/_Következő új levélhez"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Nézet/_Ugrás/_Előző megjelölt levélhez"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Nézet/_Ugrás/_Következő megjelölt levélhez"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Nézet/_Ugrás/_Előző címkézett levélhez"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Nézet/_Ugrás/_Következő címkézett levélhez"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Nézet/_Ugrás/_Másik _mappához"
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus felismerés"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Nézet/_Karakterkódolás/Kínai (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Nézet/Me_gnyitás új ablakban"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Nézet/Ü_zenet forrása"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/_Nézet/_Összes fejléc"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Nézet/Ö_sszegzés frissítése"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Levél"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_Levél/Fog_adás"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Levél/Fog_adás/_Aktuális fióknál"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Levél/Fog_adás/_Minden fióknál"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Levél/Fo_gadás/Fogadás leá_llítása"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Levél/Fog_adás/_Távoli postaláda"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Levél/Fog_adás/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Levél/_Levelek küldése a Várakozó sorból"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Levél/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Levél/Ú_j levél szerkesztése"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Levél/_Válasz"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Levél/Válasz _másnak"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Levél/Válasz _másnak/_Mindenkinek"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Levél/Válasz _másnak/A _küldőnek"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Levél/Válasz _másnak/_Levelező listának"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Levél/_Továbbítás"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Levél/Továbbítás _csatolásként"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Levél/Át_irányít"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Levél/M_ozgatás..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Levél/_Másolás..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Levél/Me_gjelöl"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Levél/Me_gjelöl/Zászlót _beállít"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Levél/Me_gjelöl/Zászlót _visszavon"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Levél/Me_gjelöl/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Levél/Me_gjelöl/Mint olvasatla_n"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Levél/Me_gjelöl/Mint olvaso_tt"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Levél/Me_gjelöl/Mint olvasott _szál"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Levél/Me_gjelöl/_Minden olvasottat"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Levél/Tö_rlés"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Levél/Levéls_zemétként beállítás"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Levél/_Nem levélszemétként beállítás"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Levél/Újrasz_erkesztés"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Eszközök/Küldő hozzáadása a cím_jegyzékhez..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Eszközök/Össz_es levél szűrése a mappában"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Eszközök/Kivá_lasztott levelek szűrése"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Eszközök/_Szűrési szabályok"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Eszközök/_Szűrési szabályok/_Automatikusan"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Eszközök/_Szűrési szabályok/_Feladó alapján"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Eszközök/_Szűrési szabályok/_Címzett alapján"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Eszközök/_Szűrési szabályok/_Tárgy alapján"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Eszközök/Levéls_zemét szűrése a mappában"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Eszközök/Ki_választott levelek szűrése levélszemétre"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Eszközök/_Duplikált levelek törlése"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Eszközök/_Szétválasztott levelek összekapcsolása"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Eszközök/Megjelölt _processz futtatása"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Eszközök/Levéls_zemét szűrése a mappában"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Eszközök/Össz_es levél szűrése a mappában"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Eszközök/_Napló ablak"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Beállítások"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Beállítások/Ál_talános beállítások..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Beállítások/_Szűrő beállítások..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Beállítások/Sa_blonok..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Beállítások/Mű_veletek..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Beállítások/Beé_pülő kezelő..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Beállítások/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Beállítások/Aktuális _fiók beállításai..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Beállítások/Ú_j fiók létrehozása..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Beállítások/Fió_kok szerkesztése..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Beállítások/_Aktuális fiók váltása..."
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/Sú_gó/_Kézikönyv"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/Sú_gó/_Kézikönyv/_Angol"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Sú_gó/_Kézikönyv/_Japán"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/Sú_gó/_GYIK"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/Sú_gó/_GYIK/_Angol"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/Sú_gó/_GYIK/_Német"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Sú_gó/_GYIK/_Spanyol"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/Sú_gó/_GYIK/_Francia"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Sú_gó/_GYIK/_Olasz"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/Sú_gó/Para_ncssor opciói"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/Sú_gó/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/Sú_gó/_Frissítés keresése..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/Sú_gó/_Beépülők frissítésének keresése..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Főablak létrehozása...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "kész.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Névtelen"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "semmi"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Kapcsolat nélkül"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Ön kapcsolat nélküli módban van. Kapcsolódik?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Kuka ürítése"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Minden levél törlése a kukából?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Postaláda hozzáadása"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3976,16 +4006,16 @@ msgstr ""
 "Ha létező postaládát ad meg, akkor\n"
 "automatikusan átvizsgálom."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A(z) `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3994,96 +4024,96 @@ 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 joga a könyvtárba."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappanézet"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Levélnézet"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Válasz"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "Válasz _mindenkinek"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Válasz a _küldőnek"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Válasz a _levelezőlistának"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Csatoláské_nt továbbít"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Ikon é_s szöveg"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Szöveg az ikontól _jobbra"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "_Ikon"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "S_zöveg"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "S_emmi"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Ön kapcsolat nélküli módban van. Kattintson az ikonra a kapcsolódáshoz."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Ön kapcsolódva van. Kattintson az ikonra a kapcsolat nélküli módhoz."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "A kiválasztott leveleket nem lehet egyesíteni."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Megnyitandó mappa kiválasztása"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Parancssori opciók"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Használat: sylpheed [OPCIÓ]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4117,7 +4147,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4151,15 +4181,15 @@ msgstr ""
 "megjeleníti ezt a súgót, majd kilép\n"
 "kiírja a verzió információkat, majd kilép"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Csak Windows opció:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport portszám"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "IPC távoli parancsok portjának megadása"
 
@@ -4393,236 +4423,236 @@ msgstr "Fájl: "
 msgid "Description: "
 msgstr "Leírás: "
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Fiók beállítások ablak megnyitása...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Fiók%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Új fiók beállításai"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Fiók beállítások"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Fiók beállítások ablak létrehozása...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Fogadás"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Küldés"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Új levél"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Magánszféra"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Haladó"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Fiók neve"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Alapértelmzésként beállítás"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Személyes információ"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Teljes név"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Email cím"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Szervezet"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Szerver információ"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Hír (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Semmi (helyi)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Ezen a szerveren kötelező az azonosítás"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Hírszerver"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Szerver a fogadáshoz"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "SMTP szerver (küldés)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Felhasználói Azonosító"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Jelszó"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Biztonságos hitelesítés használata (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Levelek törlése a szerverről fogadás után"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Eltávolítás utána"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "nap"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 nap: azonnal eltávolítani"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Minden levél letöltése (beleértve a már letöltötteket is) a szerverről"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Fogadott levél méretkorlát"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Levelek szűrése fogadás közben"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Alapértelmezett bejövő mappa"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "A nem szűrt levelek ebbe a mappába fognak kerülni."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Azonosítási módszer"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Csak a BEJÖVŐ ellenőrzése fogadáskor"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Új levelek szűrése fogadás közben a BEJÖVŐ mappában"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Hír"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "A letölteni kívánt maximális cikkek száma"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Ha 0 van megadva, akkor korlátlan."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Fogadás mindről' ellenőrizze ezt a fiókot is"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Fejléc"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Dátum fejléc mező hozzáadás"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Message-ID létrehozása"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Felhasználó által definiált fejléc hozzáadása"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Szerkesztés... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Azonosítás"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP azonosítás (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4630,241 +4660,245 @@ msgstr ""
 "Ha ezeket a mezőket üresen hagyja, a levelek fogadásához használt "
 "felhasználói azonosító és jelszó lesz használva."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Azonosítás küldés előtt POP3-mal"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Aláírás"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Közvetlen bemenet"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Név:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Parancskimenet"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Aláírás beillesztése az idézet elé (nem ajánlott)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Az alábbi címek automatikus beállítása"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Másolat"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Titkos másolat"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Válaszcím"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "Levél digitális aláírása alapértelmezésként"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "Levél titkosítsa alapértelmezésként"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Titkosítás, ha titkosított levélre válaszol"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII-páncélozott formátum használata titkosításhoz"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Szöveges aláírás használata"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Alapértelmezett GnuPG kulcs használata"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Kulcs választása az email címe alapján"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Kulcs kézi megadása"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Felhasználó vagy kulcs azonosító:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Nem használ SSL-t"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "SSL használata POP3 kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "STARTTLS parancs használata SSL kapcsolat indításához"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL használata IMAP4 kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "SSL használata NNTP kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Küldés (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "SSL használata SMTP kapcsolathoz"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Nem-blokkolódó SSL használata"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Ezt kapcsolja ki, ha az SSL kapcsolattal probléma van."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "SOCKS proxy használata"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Gépnév:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Port:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Azonosítás használata"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Név:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "SOCKS proxy használata küldéshez"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "SMTP port megadása"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "POP3 port megadása"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 port megadása"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "NNTP port megadása"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Tartománynév megadása"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP szerver könyvtár"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Csak ezen könyvtár almappái fognak megjelenni."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Kilépéskor töröl minden gyorstárazott levelet"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Elküldött levelek elhelyezése"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Vázlatok elhelyezése"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Várakozó levelek elhelyezése"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Törölt levelek elhelyezése"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "A fiók neve nincs megadva."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Nincs emailcím megadva."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Nincs SMTP szerver megadva."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Nincs felhasználói azonosító megadva."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Nincs POP3 szerver megadva."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Nincs IMAP4 szerver megadva."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Nincs NNTP szerver megadva."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "A megadott mappa nem egy várakozó mappa."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/it.po b/po/it.po
index dc3d1bb0..69b05284 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2008-01-26 09:42+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -28,203 +28,208 @@ msgstr "Filtro mail spazzatura (manuale)"
 msgid "Junk mail filter"
 msgstr "Filtro mail spazzatura"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connessione IMAP4 a %s è stata interrotta. Riconnessione...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Il server IMAP4 disabilita il LOGIN.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 #, fuzzy
 msgid "Could not establish IMAP connection.\n"
 msgstr "Impossibile stabilire la sessione IMAP4 con: %s:%d\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creazione della connessione IMAP4 a %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Impossibile avviare la sessione TLS.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, fuzzy, c-format
 msgid "Getting message %u"
 msgstr "Ricezione del messaggio %d"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Aggiunta di messaggi in %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Spostamento dei messaggi da %s in %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copia dei messaggi da %s in %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Rimozione messaggi %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "impossibile impostare i flag eliminati: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "impossibile cancellare\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Rimozione di tutti i messaggi in %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "impossibile impostare i flag eliminati: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "impossibile chiudere la cartella\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "la cartella radice %s non esiste\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "si è verificato un errore durante la ricezione di LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Impossibile creare «%s»\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Impossibile creare «%s» sotto IN ENTRATA\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "impossibile creare la casella postale: LIST fallito\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "impossibile creare la casella postale\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "impossibile creare la casella postale\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossibile rinominare la casella postale: %s in %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "impossibile eliminare la casella postale\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Ricezione intestazioni del messaggio (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "si è verificato un errore durante la ricezione della busta.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "impossibile analizzare la busta: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "impossibile ricevere la busta\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossibile connettersi al server IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Impossibile stabilire la sessione IMAP4 con: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "impossibile ricevere il namespace\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "impossibile selezionare la cartella: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "errore durante il comando imap: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autenticazione IMAP4 fallita.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Login IMAP4 fallito.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "impossibile aggiungere %s a %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(spedizione del file...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossibile aggiungere a %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossibile copiare %s in %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "errore durante il comando imap: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "errore durante il comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "errore durante il comando imap: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non può convertire UTF-7 in %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non può convertire %s in UTF-7\n"
@@ -500,7 +505,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "si è verificato un errore durante la sessione POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "la scrittura della configurazione sul file è fallita\n"
@@ -552,50 +557,50 @@ msgstr "risposta SMTP difettosa\n"
 msgid "error occurred on SMTP session\n"
 msgstr "si è verificato un errore durante la sessione SMTP\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 non disponibile\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 disponibile\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 non disponibile\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 disponibile\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "Metodo SSL non disponibile\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Metodo SSL sconosciuto *BUG DEL PROGRAMMA*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Errore creando il contesto ssl\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Connessione SSL usando %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Certificato del server:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Oggetto: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Distributore: %s\n"
@@ -655,7 +660,7 @@ 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_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -696,14 +701,14 @@ msgstr ""
 "tutti»."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protocollo"
 
@@ -831,13 +836,13 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Indirizzo"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Note"
 
@@ -850,7 +855,7 @@ msgstr "Selezione della cartella della rubrica"
 msgid "Auto-registered address"
 msgstr "Modelli registrati"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_File"
@@ -871,10 +876,10 @@ msgstr "/_File/Nuovo _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_File/Nuovo server _LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_File/---"
@@ -891,21 +896,21 @@ msgstr "/_File/_Elimina"
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 
@@ -952,7 +957,7 @@ msgstr "/_Indirizzo/_Modifica"
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/S_trumenti"
@@ -965,12 +970,12 @@ msgstr "/S_trumenti/Importa file _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/S_trumenti/Importa file _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
@@ -988,7 +993,7 @@ msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1030,7 +1035,7 @@ msgstr "Rubrica"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Cartella"
 
@@ -1042,17 +1047,17 @@ msgstr "Indirizzo e-mail"
 msgid "Search:"
 msgstr "Ricerca:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "A:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1259,7 +1264,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1315,406 +1320,411 @@ msgstr "Marrone"
 msgid "None"
 msgstr "Niente"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Apri"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Aggiungi..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Rimuovi"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Proprietà..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_File/In_via"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_File/Invia _più tardi"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_File/_Salva nella cartella «Bozze»"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_File/Sa_lva e mantieni l'editazione"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_File/_Allega file"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_File/_Inserisci file"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_File/Inserisci fi_rma"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_File/A_ggiungi firma"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Modifica/_Annulla"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Modifica/_Ripeti"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Modifica/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Modifica/_Taglia"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Modifica/Incolla co_me citazione"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Modifica/_Seleziona tutto"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Modifica/A capo _paragrafo attuale"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Modifica/A capo tutte le righe _lunghe"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A cap_o automatico"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Visualizza"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Visualizza/_A"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Visualizza/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Visualizza/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/_Visualizza/_Rispondi a"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/_Visualizza/_Seguito di"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Visualizza/R_ighello"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Visualizza/Alle_gato"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Visualizza/Per_sonalizza barra degli strumenti"
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Visualizza/Co_difica caratteri"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Visualizza/Co_difica caratteri/_Automatica"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visualizza/Co_difica·caratteri/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visualizza/Co_difica·caratteri/ASCII a 7 bit (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visualizza/Co_difica caratteri/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (IS_O-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Centrale (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (I_SO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visualizza/Co_difica caratteri/Greco (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Visualizza/Co_difica caratteri/Arabo (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Visualizza/Co_difica caratteri/Arabo (_Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visualizza/Co_difica caratteri/Turco (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visualizza/Co_difica caratteri/Ciri_llico (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (_Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Coreano (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailandese (TIS-_620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailan_dese (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/S_trumenti/_Rubrica"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/S_trumenti/_Modello"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/S_trumenti/A_zioni"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/S_trumenti/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Strumenti/Modifica con l'_editor esterno"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Strumenti/Firma P_GP"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Strumenti/C_ifratura PGP"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/S_trumenti/_Controllo ortografico"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/S_trumenti/Impo_sta lingua"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Impossibile ricevere parte del testo\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componi%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Firma"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Oggetto vuoto"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Allegati"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 #, fuzzy
 msgid "_Send"
 msgstr "Invia"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1722,44 +1732,44 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, 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:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, 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:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1771,11 +1781,11 @@ msgstr ""
 "\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1789,15 +1799,15 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Cifratura con Bcc"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1811,96 +1821,106 @@ msgstr ""
 "\n"
 "Inviarlo comunque?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Il file %s non esiste."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Impossibile aprire il file %s."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Data"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Firma"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Controllo della firma"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: il file non esiste\n"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Apertura file eseguibile"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1912,12 +1932,12 @@ msgstr ""
 "Se volete lanciarlo, salvatelo da qualche parte e assicuratevi che non sia "
 "un virus o qualcosa di simile a un programma malizioso."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, 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:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1926,48 +1946,48 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "_Personalizza barra strumenti"
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -2008,7 +2028,7 @@ msgid "Nick Name"
 msgstr "Nick"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Indirizzo e-mail"
 
@@ -2066,7 +2086,7 @@ msgid " Check File "
 msgstr " Controllo file "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "File"
 
@@ -2074,63 +2094,63 @@ msgstr "File"
 msgid "Add New Address Book"
 msgstr "Aggiungi nuova rubrica"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Deve essere fornito un nome del gruppo."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Modifica i dati del gruppo"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Nome del gruppo"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Indirizzi disponibili"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Indirizzi nel gruppo"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Sposta gli indirizzi di e-mail da o in un gruppo con i pulsanti freccia"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Modifica i dettagli del gruppo"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Aggiunta di un nuovo gruppo"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Modifica la cartella"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -2147,7 +2167,7 @@ msgid "Edit JPilot Entry"
 msgstr "Modifica la voce JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2212,7 +2232,7 @@ msgstr "Timeout (secondi)"
 msgid "Maximum Entries"
 msgstr "Numero massimo di voci"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Essenziale"
 
@@ -2305,7 +2325,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Seleziona... "
 
@@ -2494,12 +2514,12 @@ msgstr "Impostazione delle informazioni della cartella...\n"
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
@@ -3343,694 +3363,704 @@ msgstr ""
 "È stata trovata una versione precedente della configurazione.\n"
 "Trasferirla?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_File/Ca_rtella"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_File/Ca_rtella/Crea _nuova cartella..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_File/Ca_rtella/_Rinomina cartella..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_File/Ca_rtella/_Sposta cartella..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_File/Ca_rtella/Eli_mina cartella"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_File/_Casella postale"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_File/_Casella postale/_Aggiungi casella postale..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_File/_Casella postale/Rimuovi ca_sella postale"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_File/_Casella postale/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_File/_Casella postale/_Controllo nuovi messaggi"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_File/_Casella postale/Controllo nuovi _messaggi in tutte le cartelle"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_File/_Casella postale/R_icostruisci l'albero cartella"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 #, fuzzy
 msgid "/_File/_Import mail data..."
 msgstr "/_File/_Importa file mbox..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_File/_Export mail data..."
 msgstr "/_File/Esp_orta file mbox..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_File/S_vuota cestino"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_File/Sa_lva come..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_File/I_mposta pagina..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_File/Stam_pa..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_File/Lavora offli_ne"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_File/_Esci"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Modifica/Seleziona t_hread"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Modifica/_Trova nel messaggio attuale..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Modifica/Ricerca _messaggi..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 #, fuzzy
 msgid "/_Edit/_Quick search"
 msgstr "/_Modifica/_Incolla"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Visualizza/Mostra o _nascondi"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Visualizza/Mostra o _nascondi/A_lbero cartella"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Visualizza/Mostra o _nascondi/Vista _messaggio"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/Icone _e testo"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr ""
 "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/Testo a dest_ra "
 "dell'icona"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/I_cone"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/_Testo"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/_Niente"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Visualizza/Mostra o _nascondi/_Barra di ricerca"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra di s_tato"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Visualizza/Per_sonalizza barra degli strumenti"
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 #, fuzzy
 msgid "/_View/Layou_t"
 msgstr "/_Visualizza/_Ordina"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 #, fuzzy
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Visualizza/_Ordina/per _mittente"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr ""
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visualizza/Albero _cartella separato"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Visualizza/Vista m_essaggio separata"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Visualizza/_Ordina"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visualizza/_Ordina/per n_umero"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Visualizza/_Ordina/per dim_ensione"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Visualizza/_Ordina/per _data"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Visualizza/_Ordina/pe_r data del thread"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Visualizza/_Ordina/per _mittente"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Visualizza/_Ordina/per dest_inatario"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Visualizza/_Ordina/per _oggetto"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visualizza/_Ordina/per colore etic_hetta"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visualizza/_Ordina/per _segno"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Visualizza/_Ordina/per non le_tti"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visualizza/_Ordina/per a_llegato"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visualizza/_Ordina/No_n ordinare"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Visualizza/_Ordina/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Visualizza/_Ordina/_Ascendente"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Visualizza/_Ordina/Dis_cendente"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visualizza/_Ordina/_Raggruppa per oggetto"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Visualizza/Vista _thread"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visualizza/E_spandi tutti i thread"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visualizza/Nascondi tutti i t_hread"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Visualizza/I_mposta voci da visualizzare..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Visualizza/V_ai a"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Visualizza/V_ai a/Messaggio preced_ente"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visualizza/V_ai a/Messaggio successi_vo"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Visualizza/V_ai a/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio non letto p_recedente"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio non _letto successivo"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Visualizza/V_ai a/Messaggio nuovo pre_cedente"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visualizza/V_ai a/Messaggio nu_ovo successivo"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Visualizza/V_ai a/Messaggio _segnato precedente"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visualizza/V_ai a/Messaggio se_gnato successivo"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Visualizza/V_ai a/Messaggio etic_hettato precedente"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visualizza/V_ai a/Messaggio e_tichettato successivo"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visualizza/V_ai a/Cartella di_fferente..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visualizza/Co_difica caratteri/_Autorilevamento"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visualizza/Co_difica caratteri/Gia_pponese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (S_hift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Corea_no (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Visualizza/Apri nuova _finestra"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Visualizza/Sorgente messagg_io"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/_Visualizza/Tutte le intesta_zioni"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Visualizza/A_ggiorna sommario"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/M_essaggio"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/M_essaggio/Rice_vi"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/M_essaggio/Rice_vi/Ricevi dall'a_ccount attuale"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/M_essaggio/Rice_vi/Ricevi da _tutti gli account"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/M_essaggio/Rice_vi/Ferma rice_zione"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/M_essaggio/Rice_vi/Ricevi da _tutti gli account"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/M_essaggio/Rice_vi/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/M_essaggio/Invia messa_ggi accodati"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/M_essaggio/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/M_essaggio/Componi _nuovo messaggio"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/M_essaggio/_Rispondi"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/M_essaggio/Rispondi _a"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/M_essaggio/Rispondi _a/_tutti"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/M_essaggio/Rispondi _a/_mittente"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/M_essaggio/Rispondi _a/mailing _list"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/M_essaggio/_Inoltra"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/M_essaggio/Inoltra come a_llegato"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/M_essaggio/Rispe_disci"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/M_essaggio/Sp_osta..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "M_essaggio/_Copia..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/M_essaggio/_Segna"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 #, fuzzy
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/M_essaggio/_Segna/Segn_a"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/M_essaggio/_Segna/To_gli segno"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/M_essaggio/_Segna/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/M_essaggio/_Segna/Segna co_me non letto"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/M_essaggio/_Segna/Segna come _letto"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/M_essaggio/_Segna/Segna il _thread come letto"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/M_essaggio/_Segna/Segna come tutti l_etti"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/M_essaggio/Eli_mina"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/M_essaggio/Imposta come mail spa_zzatura"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Messaggio/Im_posta come mail normale"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/M_essaggio/Rimodi_fica"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/S_trumenti/Aggiungi mittente alla ru_brica..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/S_trumenti/_Filtra tutti i messaggi nella cartella"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/S_trumenti/Filtra i messaggi _selezionati"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/S_trumenti/_Crea regola per il filtro"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/S_trumenti/_Crea regola per il filtro/A_utomaticamente"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _Da"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _A"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/S_trumenti/_Crea regola per il filtro/con l'_Oggetto"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/S_trumenti/Filtra le mail s_pazzatura nella cartella"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/S_trumenti/Filtra le _mail spazzatura nei messaggi selezionati"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/S_trumenti/Elimina messaggi _duplicati"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 #, fuzzy
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/S_trumenti/Elimina messaggi _duplicati"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/S_trumenti/Ese_gui i processi segnati"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/S_trumenti/Filtra le mail s_pazzatura nella cartella"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/S_trumenti/_Filtra tutti i messaggi nella cartella"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/S_trumenti/Finestra di _log"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Configurazione"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configurazione/Preferenze _comuni..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Configurazione/Impostazioni _filtro..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Configurazione/Mo_dello..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configurazione/_Azioni..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 #, fuzzy
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Configurazione/Mo_dello..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Configurazione/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configurazione/_Preferenze per l'account attuale..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configurazione/Crea _nuovo account..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configurazione/_Modifica account..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configurazione/Cam_bia account attuale"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/A_iuto/_Manuale"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/A_iuto/_Manuale/Ingl_ese"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_iuto/_Manuale/_Giapponese"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/A_iuto/_FAQ"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_iuto/_FAQ/Ingl_ese"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_iuto/_FAQ/_Tedesco"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_iuto/_FAQ/_Spagnolo"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_iuto/_FAQ/_Francese"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_iuto/_FAQ/_Italiano"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/A_iuto/Opzioni linea _comando"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/A_iuto/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr ""
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr ""
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Creazione della finestra principale...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "niente"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Siete offline. Andare online?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Svuota cestino"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Svuotare tutti i messaggi nei cestini?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Aggiunta di una casella postale"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -4040,16 +4070,16 @@ msgstr ""
 "Se è specificata una casella postale esistente, sarà\n"
 "esaminata automaticamente."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4059,96 +4089,96 @@ msgstr ""
 "Può darsi che esistano già alcuni file, oppure non si ha il permesso di "
 "scrittura."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vista cartella"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Rispondi a _tutti"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Rispondi _al mittente"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Icon_a e testo"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Testo a dest_ra dell'icona"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "_Icona"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_Testo"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_Niente"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Selezione della cartella"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Opzioni della linea di comando"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPZIONE]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4181,7 +4211,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4214,15 +4244,15 @@ msgstr ""
 "mostra questo aiuto ed esce\n"
 "mostra informazioni sulla versione ed esce"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport portnum      specifca la porta per i comandi IPC da remoto"
@@ -4462,237 +4492,237 @@ msgstr "File"
 msgid "Description: "
 msgstr "Descrizione"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Apertura della finestra delle preferenze degli account...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Preferenze per il nuovo account"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Preferenze dell'account"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Creazione della finestra delle preferenze degli account...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Ricevi"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Invia"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Componi"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Nome di questo account"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Imposta come predefinito"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Informazioni personali"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Indirizzo di posta"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Informazioni sui server"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 # src/prefs_account.c:634
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Nessuno (locale)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Questo server richiede l'autenticazione"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Server delle news"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Server per la ricezione"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Server SMTP (spedisce)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "User ID"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Password"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Usa l'autenticazione sicura (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Rimuovi i messaggi sul server dopo averli ricevuti"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Rimuovi dopo "
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr " giorni"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 giorni: rimuovi immediatamente"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Scarica tutti i messaggi (includendo quelli già ricevuti) sul server"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Limite della dimensione da ricevere di"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtra i messaggi in ricezione"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Inbox predefinita"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "I messaggi non filtrati saranno memorizzati in questa cartella."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Controlla solo «In entrata» in ricezione"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtra i nuovi messaggi in ricezione nella cartella «In entrata»"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Numero massimo di articoli da scaricare"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Nessun limite se viene specificato 0."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "«Ricevi tutti» controlla i nuovi messaggi su questo account"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Intestazione"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Aggiungi il campo Data nell'intestazione"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Genera ID messaggio"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Aggiungi un'intestazione definita dall'utente"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Modifica... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticazione SMTP (SMTP AUT)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4700,246 +4730,250 @@ msgstr ""
 "Lasciando vuote queste voci verranno usate la stessa user ID e password "
 "della ricezione."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentica con POP3 prima dell'invio"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Firma"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Input diretto"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Nome:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Output del comando"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Rispondi a"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "PGP firma il messaggio per predefinizione"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "PGP cifra il messaggio per predefinizione"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Cifra quando rispondi a un messaggio cifrato"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usa il formato ASCII-armato per la cifratura"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Usa la firma con il testo in chiaro"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Usa la chiave predefinita di GnuPG"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Scegli la chiave per il tuo indirizzo email"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Specifica la chiave manualmente"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "ID user o chiave:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Non usare SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Usa SSL per la connessione POP3"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usa il comando STARTTLS per iniziare la sessione SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usa SSL per la connessione IMAP4"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Usa SSL per la connessione NNTP"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Invio (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Usa SSL per la connessione SMTP"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Usa SSL non bloccato"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Disattivare se si hanno problemi nella connessione SSL."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 #, fuzzy
 msgid "Hostname:"
 msgstr "Nome dell'host"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 #, fuzzy
 msgid "Port:"
 msgstr "Porta"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 #, fuzzy
 msgid "Use authentication"
 msgstr "Autenticazione"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Nome:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 #, fuzzy
 msgid "Password:"
 msgstr "Password"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 #, fuzzy
 msgid "Use SOCKS proxy on sending"
 msgstr "Usa un programma esterno per l'invio"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Specifica la porta SMTP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Specifica la porta POP3"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Specifica la porta IMAP4"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Specifica la porta NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Specifica il nome di dominio"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Directory del server IMAP4"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Verranno visualizzate solo le sottocartelle di questa directory."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Pulisci tutte le cache dei messaggi all'uscita"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Metti i messaggi spediti in"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Metti i messaggi abbozzati in"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Metti i messaggi accodati in"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Metti i messaggi eliminati in"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Non è stato immesso il nome dell'account."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Non è stato immesso l'indirizzo di posta."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Non è stato immesso il server SMTP."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Non è stato immesso lo user ID."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Non è stato immesso il server POP3."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Non è stato immesso il server IMAP4."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Non è stato immesso il server NNTP."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "La cartella specificate non è una cartella «Coda»."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/ja.po b/po/ja.po
index ac01fb48..f119043d 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: 2017-02-07 18:40+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+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"
@@ -27,202 +27,206 @@ msgstr "迷惑メールフィルタ (手動)"
 msgid "Junk mail filter"
 msgstr "迷惑メールフィルタ"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s へのIMAP4の接続が切れています。再接続します...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAPサーバは LOGIN を無効にしています。\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "IMAP の接続を確立できませんでした。\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d へのIMAP4の接続を確立中...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "TLS セッションを開始できません。\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(FLAGS を取得中...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "メッセージ %u を取得中"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "メッセージを %s に追加しています (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "メッセージ %s を %s に移動しています..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "メッセージ %s を %s にコピーしています..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "メッセージ %s を削除しています"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "deleted フラグをセットできません: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "expunge できません\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "%s のすべてのメッセージを削除しています"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "deleted フラグをセットできません: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "フォルダをクローズできません\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "ルートフォルダ %s が存在しません\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST の取得中にエラーが発生しました。\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s' を作成できません。\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOX の下に '%s' を作成できません。\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "メールボックスを作成できません: LIST に失敗\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "メールボックスを作成できません\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+msgid "can't subscribe mailbox\n"
+msgstr "メールボックスを購読できません\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "メールボックスを名称変更できません: %s -> %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "メールボックスを削除できません\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "メッセージのヘッダを取得中 (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "エンベロープを取得中にエラーが発生しました。\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "エンベロープを解析できません: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "エンベロープを取得できません\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 サーバ: %s:%d に接続できません\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "%s:%d との IMAP4 セッションを確立できません\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "namespace を取得できません\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "フォルダ %s を選択できません\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "imap コマンド中のエラー: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 の認証に失敗しました。\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4のログインに失敗しました。\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s を %s に追加できません\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(ファイルを送信中...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "メッセージを %s に追加できません\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s を %s にコピーできません\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap コマンド中のエラー: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap コマンド中のエラー: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "imap コマンド中のエラー: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv が UTF-7 を %s に変換できません\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv が %s を UTF-7 に変換できません\n"
@@ -691,7 +695,7 @@ msgstr ""
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
 #: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
@@ -831,7 +835,7 @@ msgid "Address"
 msgstr "アドレス"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "備考"
 
@@ -2001,7 +2005,7 @@ msgid "Nick Name"
 msgstr "ニックネーム"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "電子メール アドレス"
 
@@ -2067,62 +2071,62 @@ msgstr "ファイル"
 msgid "Add New Address Book"
 msgstr "新規アドレス帳を追加"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "グループ名を指定する必要があります。"
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "グループデータの編集"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "グループ名"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "利用可能なアドレス"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  →  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  ←  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "グループのアドレス"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "矢印ボタンで電子メールアドレスをグループに(から)移動"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "グループの詳細の編集"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "新規グループの追加"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "フォルダの編集"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "フォルダの新しい名前を入力してください:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "新規フォルダ"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "新規フォルダの名前を入力してください:"
 
@@ -4880,7 +4884,7 @@ msgstr "NNTPサーバが入力されていません。"
 msgid "Specified folder is not a queue folder."
 msgstr "指定したフォルダは送信待ちフォルダではありません。"
 
-#: src/prefs_account_dialog.c:2396
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/ko.po b/po/ko.po
index 1ec0520f..98539ec4 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: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+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"
@@ -29,210 +29,215 @@ msgstr "폴더"
 msgid "Junk mail filter"
 msgstr "폴더"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s:%d에대한 IMAP4 접속이 끊어졌습니다. 다시 접속...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP 서버 디렉토리"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 #, fuzzy
 msgid "Could not establish IMAP connection.\n"
 msgstr "IMAP4 세션을 만들 수 없습니다: %s: %d\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d에대한 IMAP4 접속을 만듭니다 ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "TLS 세션을 시작할 수 없습니다.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, fuzzy, c-format
 msgid "Getting message %u"
 msgstr "%d 메시지를 삭제하는 중"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "메시지 %s%c%d를 %s로 이동합니다...\n"
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "삭제 플래그를 설정할 수가 없습니다: %d\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "지울 수가 없습니다\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "삭제 플래그를 설정할 수가 없습니다: 1:%d\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "폴더를 선택할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "표시 파일이 발견되지않음.\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST를 얻는 도중 에러가 발생.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s'를 생성할 수가 없습니다\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOX 아래에 '%s'를 생성할 수가 없습니다\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "우편함을 생성할 수 없습니다: LIST 실패\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "우편함을 생성할 수 없습니다\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "우편함을 생성할 수 없습니다\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "우편함명을 바꿀 수 없습니다: %s에서 %s로\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "우편함을 삭제할 수 없습니다\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "envelope를 얻는 중 에러 발생.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "envelope를 파싱할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "envelope를 얻을 수가 없습니다\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 서버에 연결할 수가 없습니다\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 세션을 만들 수 없습니다: %s: %d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "namespace를 얻을 수 없습니다\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "폴더를 선택할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "인증 방법"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 로그인을 실패했습니다.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s를 %s에 붙일 수 없습니다\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(파일을 보냅니다...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "%s 메시지를 추가할 수가 없습니다\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%d를 %s로 복사할 수가 없습니다\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 명령어 실행중 에러: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv가 UTF-7를 %s로 변환할 수 없습니다\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv가 %s를 UTF-7로 변환할 수 없습니다\n"
@@ -505,7 +510,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "인증 도중 에러 발생\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "파일에 설정을 쓰기가 실패했습니다\n"
@@ -558,50 +563,50 @@ msgstr ""
 msgid "error occurred on SMTP session\n"
 msgstr "인증 도중 에러 발생\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23을 사용할 수 없습니다\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23을 사용할 수 있습니다\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1을 사용할 수 없습니다\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1을 사용할 수 있습니다\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "SSL를 사용할 수 없습니다\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "모르는 SSL *프로그램 버그*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "ssl 문맥 생성 에러\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "%s 사용하여 SSL 연결\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "서버 증명:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  제목: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  발행인: %s\n"
@@ -648,7 +653,7 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -687,14 +692,14 @@ msgstr ""
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "이름"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "프로토콜"
 
@@ -822,13 +827,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "주소"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "메모"
 
@@ -841,7 +846,7 @@ msgstr "주소록 폴더 선택"
 msgid "Auto-registered address"
 msgstr "등록된 규칙"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/파일(_F)"
@@ -863,10 +868,10 @@ msgstr "/파일(_F)/새 JPilot(_J)"
 msgid "/_File/New _LDAP Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
@@ -883,21 +888,21 @@ msgstr "/파일(_F)/삭제(_D)"
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
@@ -944,7 +949,7 @@ msgstr "/주소(_A)/편집(_E)"
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/도구(_T)"
@@ -958,12 +963,12 @@ msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 msgid "/_Tools/Import _CSV file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
@@ -981,7 +986,7 @@ msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1025,7 +1030,7 @@ msgstr "주소록"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "폴더"
 
@@ -1038,17 +1043,17 @@ msgstr "이메일 주소"
 msgid "Search:"
 msgstr "찾기"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "받는 사람:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "참조:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "숨은 참조:"
@@ -1256,7 +1261,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "알림"
 
@@ -1312,449 +1317,454 @@ msgstr "갈색"
 msgid "None"
 msgstr "없음"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/열기(_O)"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/추가(_A)..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/삭제(_R)"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/특성(_P)..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/compose.c:581
+#: src/compose.c:586
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/메시지(_M)/나중에 보내기(_l)"
 
-#: src/compose.c:584
+#: src/compose.c:589
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/메시지(_M)/임시 보관함으로 보내기(_d)"
 
-#: src/compose.c:586
+#: src/compose.c:591
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/메시지(_M)/저장하고 편집 보존(_k)"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/파일(_F)/첨부 파일(_A)"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/파일(_F)/파일 삽입(_I)"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/파일(_F)/서명 삽입(_g)"
 
-#: src/compose.c:593
+#: src/compose.c:598
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/파일(_F)/서명 삽입(_g)"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/편집(_E)/실행취소(_U)"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/편집(_E)/다시 실행(_R)"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/편집(_E)/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/편집(_E)/잘라내기(_t)"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/편집(_E)/quotation으로 붙여넣기(_q)"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/편집(_E)/모두 선택(_a)"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/편집(_E)/현재 단락 자동 줄바꿈(_W)"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/편집(_E)/모든 긴 라인 자동 줄바꿈(_l)"
 
-#: src/compose.c:612
+#: src/compose.c:617
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/보기(_V)"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/보기(_V)/To(_T)"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/보기(_V)/Cc(_C)"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/보기(_V)/Bcc(_B)"
 
-#: src/compose.c:617
+#: src/compose.c:622
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/보기(_V)/Reply to(_R)"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/보기(_V)/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/보기(_V)/따라올리기(_F)"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/보기(_V)/Ruler(_u)"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/보기(_V)/첨부(_A)"
 
-#: src/compose.c:625
+#: src/compose.c:630
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/보기(_V)/문자셋(_C)/7bit 아스키 (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/보기(_V)/문자셋(_C)/유니코드(_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/보기(_V)/문자셋(_C)/중앙 유럽(ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/보기(_V)/문자셋(_C)/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/보기(_V)/문자셋(_C)/터기 (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (ISo-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (EUC-KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/도구(_T)/주소록(_A)"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/도구(_T)/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/편집(_E)/외부 편집기로 편집(_x)"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:728
+#: src/compose.c:733
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:733
+#: src/compose.c:738
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/도구(_T)/실행(_x)"
 
-#: src/compose.c:734
+#: src/compose.c:739
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "텍스트 부분을 얻을 수가 없습니다\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "인용 부호 형식 에러."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "메시지 회신/전달 형식 에러."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "%s를 읽을 수가 없습니다."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "서명"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 #, fuzzy
 msgid "Empty subject"
 msgstr "제목"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "첨부"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "다음 주소를 자동적으로 정함"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "제목:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 #, fuzzy
 msgid "_Send"
 msgstr "메일 발송"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1762,42 +1772,42 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1807,12 +1817,12 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 #, fuzzy
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1821,15 +1831,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1838,99 +1848,109 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "%s 파일을 열 수가 없습니다\n"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "날짜"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "서명"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "서명 확인"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: 파일이 없습니다\n"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1938,12 +1958,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1953,52 +1973,52 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -2040,7 +2060,7 @@ msgid "Nick Name"
 msgstr "가명"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "이메일 주소"
 
@@ -2099,7 +2119,7 @@ msgid " Check File "
 msgstr " 파일 확인 "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "파일"
 
@@ -2108,62 +2128,62 @@ msgstr "파일"
 msgid "Add New Address Book"
 msgstr "새 주소록 추가"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "그룹명이 지정되지 않았습니다."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "그룹 자료 편집"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "그룹명"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "사용가능한 주소"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "그룹의 주소"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "화살표 버튼으로 그룹에서 혹은 그룹으로 전자우편 주소 이동"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "그룹 상세내용 편집"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "새 그룹 추가"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "폴더 편집"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "새 폴더"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
@@ -2180,7 +2200,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot 항목 편집"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2245,7 +2265,7 @@ msgstr ""
 msgid "Maximum Entries"
 msgstr ""
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "기본"
 
@@ -2337,7 +2357,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr "고르기..."
 
@@ -2532,12 +2552,12 @@ msgstr "폴더 정보를 설정합니다...\n"
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
@@ -3372,736 +3392,746 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/파일(_F)/폴더(_F)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/파일(_F)/폴더(_F)/새 폴더(_n)"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/파일(_F)/폴더(_F)/폴더 이름 변경(_R)..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/파일(_F)/폴더(_F)/폴더 이름 변경(_R)..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/파일(_F)/폴더(_F)/폴더 삭제(_D)"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/파일(_F)/메일 박스 추가(_A)..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/파일(_F)/메일 박스 추가(_A)..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/메일박스를 지우기(_m)"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/파일(_F)/폴더(_F)"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/새 메시지 확인(_C)"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/파일(_F)/모든 폴더의 새 메시지 확인(_C)"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/폴더 트리 갱신(_e)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 #, fuzzy
 msgid "/_File/_Import mail data..."
 msgstr "/파일(_F)/mbox 파일 가져오기(_I)..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_File/_Export mail data..."
 msgstr "/파일(_F)/mbox 파일로 저장(_E)..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/파일(_F)/지운 편지함 비우기(_t)"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/파일(_F)/새 이름으로(_S)..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/파일(_F)/새 이름으로(_S)..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/파일(_F)/인쇄(_P)..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/파일(_F)/파일 삽입(_I)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/파일(_F)/끝내기(_x)"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/편집(_E)/쓰레드 선택(_t)"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/편집(_E)/현재 메시지 찾기(_F)..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/편집(_E)/메시지 찾기(_S)..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 #, fuzzy
 msgid "/_Edit/_Quick search"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/보기(_V)/보이거나 감추기(_d)"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/보기(_V)/보이거나 감추기(d)/폴더 트리(_F)"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/보기(_V)/보이거나 감추기(_d)/메시지 보기(_M)"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘과 텍스트(_a)"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘(_I)"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘(_I)"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/텍스트(_T)"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/없음(_N)"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/상태바(_b)"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/상태바(_b)"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 #, fuzzy
 msgid "/_View/Layou_t"
 msgstr "/보기(_V)/정렬(_S)"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 #, fuzzy
 msgid "/_View/Layou_t/_Normal"
 msgstr "/보기(_V)/정렬(_S)/보낸 사람(_f)"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr ""
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/보기(_V)/별도의 폴더 트리 창(_o)"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/보기(_V)/별도의 메시지 창(_e)"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/보기(_V)/정렬(_S)"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/보기(_V)/정렬(_S)/번호(_n)"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/보기(_V)/정렬(_S)/크기(_i)"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/보기(_V)/정렬(_S)/날짜(_d)"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/보기(_V)/정렬(_S)/날짜(_d)"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/보기(_V)/정렬(_S)/보낸 사람(_f)"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/보기(_V)/정렬(_S)/크기(_i)"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/보기(_V)/정렬(_S)/제목(_s)"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/보기(_V)/정렬(_S)/색 라벨(_c)"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/보기(_V)/정렬(_S)/표시(_m)"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/보기(_V)/정렬(_S)/않읽음(_u)"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/보기(_V)/정렬(_S)/첨부(_t)"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/보기(_V)/정렬(_S)/않함(_o)"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/보기(_V)/정렬(_S)/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/보기(_V)/정렬(_S)/오름차순"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/명령(_S)/정렬(_S)/제목(_A)"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/보기(_V)/쓰레드 보기(_r)"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/보기(_V)/모든 쓰레드 펴기(_x)"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/보기(_V)/모든 쓰레드 접기(_l)"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/보기(_V)/표시 항목 설정(_i)..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/보기(_V)/가기(_G)"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/명령(_S)/가기(_G)/이전 메시지(_P)"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/보기(_V)/가기(_G)/다음 메시지(_N)"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/보기(_V)/가기(_G)/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/보기(_V)/가기(_G)/안읽은 다음 메시지(_e)"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/보기(_V)/가기(_G)/안읽은 다음 메시지(_e)"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/보기(_V)/가기(_G)/이전 새 메시지(_w)"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/보기(_V)/가기(_G)/다음 새 메시지(_x)"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/보기(_V)/가기(_G)/표시된 이전 메시지(_m)"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/보기(_V)/가기(_G)/표시된 다음 메시지(_a)"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/보기(_V)/가기(_G)/꼬리표있는 이전 메시지(_l)"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/보기(_V)/가기(_G)/꼬리표있는 다음 메시지(_b)"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/보기(_V)/문자셋(_C)/자동(_A)"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/보기(_V)/문자셋(_C)/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/보기(_V)/새 창으로 열기(_w)"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/보기(_V)/메시지 소스(_a)"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/보기(_V)/모든 헤더(_h)"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/보기(_V)/요약 갱신(_U)"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/메시지(_M)"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/메시지(_M)/받기 취소(_g)"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/메시지(_M)/임시 보관된 메시지 발송(_S)"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/메시지(_M)/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/메시지(_M)/새로 만들기(_n)"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/메시지(_M)/회신(_R)"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/메시지(_M)/회신(_y)"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/메시지(_M)/회신(_y)/전체(_a)"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/메시지(_M)/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/메시지(_M)/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/메시지(_M)/전달(_F)"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/메시지(_M)/첨부파일로 전달(_w)"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/메시지(_M)/Redirec_t"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/메시지(_M)/이동(_o)..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/메시지(_M)/복사(_C)..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/메시지(_M)/표시(_M)"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 #, fuzzy
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/메시지(_M)/표시(_M)/표시(_M)"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/메시지(_M)/표시(_M)/표시 지움(_U)"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/메시지(_M)/표시(_M)/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/메시지(_M)/표시(_M)/읽지않은 것으로 표시(_e)"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/메시지(_M)/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/메시지(_M)/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/메시지(_M)/표시(_M)/모두 읽은 것으로 표시(_r)"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/메시지(_M)/삭제(_D)"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/도구(_T)/주소록에 보낸이 추가(_k)"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/도구(_T)/필터 규칙 생성(_C)"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/자동(_A)"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/보낸이로(_F)"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/받는이로(_T)"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/제목으로(_S)"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/도구(_T)/중복된 메시지 지우기(_p)"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 #, fuzzy
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/도구(_T)/중복된 메시지 지우기(_p)"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "표시된 프로세스들을 실행합니다"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/도구(_T)/메시지 필터(_F)"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/도구(_T)/메시지 필터(_F)"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/도구(_T)/로그 창(_L)"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/설정(_C)"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/설정(_C)/기본적인 설정(_C)..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 #, fuzzy
 msgid "/_Configuration/_Filter settings..."
 msgstr "/설정(_C)/필터 설정(_F)..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/설정(_C)/템플릿(_T)..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/설정(_C)/동작(_A)..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 #, fuzzy
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/설정(_C)/템플릿(_T)..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/설정(_C)/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/설정(_C)/계정에 따른 설정(_P)..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/설정(_C)/새 계정 만들기(_n)..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/설정(_C)/계정 편집(_E)..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/설정(_C)/현재 계정을 변경(_h)"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/도움말(_H)/설명서(_M)"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/도움말(_H)/설명서(_M)/영어(_E)"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/도움말(_H)/설명서(_M)/일본어(_J)"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/도움말(_H)/FAQ(_F)"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/도움말(_H)/FAQ(_F)/영어(_E)"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/도움말(_H)/FAQ(_F)/독일어(_G)"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/도움말(_H)/FAQ(_F)/스페인어(_S)"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/도움말(_H)/FAQ(_F)/프랑스어(_F)"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/도움말(_H)/FAQ(_F)/이태리어(_I)"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "명령이 지정되지않음"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/도움말(_H)/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr ""
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr ""
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "새 창을 만듭니다...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "마침.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "제목 없슴"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "없음"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 #, fuzzy
 msgid "Empty all trash"
 msgstr "지운 편지함 비우기"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "메일박스 추가"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -4112,16 +4142,16 @@ msgstr ""
 "기존의 메일 박스가 지정되면 자동으로\n"
 "스캔될것입니다."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4130,104 +4160,104 @@ msgstr ""
 "메일박스 생성이 실패했습니다.\n"
 "아마 어떤 파일이 이미 존재하거나 그 곳에 쓰기 권한이 없습니다."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 폴더 보기"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘(_I)"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 #, fuzzy
 msgid "_Text"
 msgstr "텍스트"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 #, fuzzy
 msgid "_None"
 msgstr "없음"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "끝내기"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "이 프로그램을 끝내시겠습니까?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 #, fuzzy
 msgid "Select folder to open"
 msgstr "폴더 선택"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 #, fuzzy
 msgid "Command line options"
 msgstr "명령이 지정되지않음"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "사용법: %s [옵션]...\n"
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4246,7 +4276,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4265,15 +4295,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4520,497 +4550,501 @@ msgstr "파일"
 msgid "Description: "
 msgstr "설명"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "계정 설정 창을 엽니다...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "계정%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "새 계정에대한 설정"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "계정 기본 설정"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "계정 설정 창을 생성합니다...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "받기"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "메일 발송"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "작성"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "프라이버시"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "고급"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "이 계정의 이름"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "기본 계정으로 설정"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "신상 정보"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "정식 이름"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "메일 주소"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "기관"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "서버 정보"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "뉴스(NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "로컬"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "이 서버는 인증을 필요로 합니다"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "뉴스 서버"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "받는 서버"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "SMTP 서버(발송용)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "사용자 계정"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "암호"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "이 서버는 인증을 필요로 합니다"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "받은 후 서버에서 메시지를 지움"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 #, fuzzy
 msgid "Remove after"
 msgstr "폴더 이름 변경"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 #, fuzzy
 msgid "days"
 msgstr "항상"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 일: 즉시 삭제)"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "서버에서 모든 메시지를 받음"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "받을 크기 한도"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "받을때 메시지를 필터링"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "기본 우편함"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(필터링 되지 않은 메시지는 이 폴더에 저장될 것입니다)"
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "인증 방법"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "자동"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "받을때 메시지를 필터링"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "뉴스"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "내려받을 최대 기사 수\n"
 "(0인 경우 제한 없음)"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "헤더"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Date 헤더 항목을 추가"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Message-ID 생성"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "사용자 정의된 헤더 추가"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " 편집..."
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "인증"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 인증(SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "보내기전 POP3와 인증"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "서명"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "이름:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 #, fuzzy
 msgid "Command output"
 msgstr "명령어"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "다음 주소를 자동적으로 정함"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "참조"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "숨은 참조"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "회신주소"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "기본으로 메시지에 사인을 함"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "기본으로 메시지를 암호화"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "순수한 텍스트 서명 사용"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "기본 GnuPG 키 사용"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "당신의 전자우편 주소로 키 선택"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "수동으로 키 지정"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "사용자 혹은 키 ID:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "SSL을 사용하지 않습니다"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSL 세션을 시작하기 위해 STARTTLS 명령을 사용합니다"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP 연결에 SSL을 사용합니다"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 #, fuzzy
 msgid "Hostname:"
 msgstr "호스트명"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 #, fuzzy
 msgid "Port:"
 msgstr "포트"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 #, fuzzy
 msgid "Use authentication"
 msgstr "인증"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "이름:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 #, fuzzy
 msgid "Password:"
 msgstr "암호"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 #, fuzzy
 msgid "Use SOCKS proxy on sending"
 msgstr "발송을 위해 외부 프로그램을 사용"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "SMTP 포트 번호"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "POP3 포트 번호"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 포트 지정"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "NNTP 포트 지정"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "도메인 이름 지정"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP 서버 디렉토리"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "서버에서 모든 메시지를 받음"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "보낸 메시지 저장"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "임시 메시지 저장"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "삭제된 메시지 저장"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "삭제된 메시지 저장"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "계정 이름이 입력되지 않았습니다."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "메일 주소가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "SMTP 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "사용자 아이디가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "POP3 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "NNTP 서버가 지정되지않았습니다."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/lt.po b/po/lt.po
index 753be9d5..eafa8908 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2005-06-09 13:51+0300\n"
 "Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -27,203 +27,208 @@ msgstr "Nepageidautino pašto filtras (neautomatinis)"
 msgid "Junk mail filter"
 msgstr "Nepageidautino pašto filtras"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 prisijungimas prie %s buvo nutrauktas. Jungiamasi...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 serveris panaikina LOGIN.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 #, fuzzy
 msgid "Could not establish IMAP connection.\n"
 msgstr "Negaliu sukurti IMAP4 sesijos su: %s:%d\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "sukuriamas IMAP4 prisijungimas prie %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Negaliu sukurti TLS sesijos.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, fuzzy, c-format
 msgid "Getting message %u"
 msgstr "Gaunamas laiškas %d"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Pridedami laiškai į %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Perkeliami laiškai %s į %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopijuojami laiškai %s į %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Šalinami laiškai %s..."
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "negaliu nustatyti ištrynimo žymų: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "negaliu išbraukti\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Trinami laiškai iš %s..."
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "negaliu nustatyti ištrynimo žymų: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "negaliu uždaryti katalogo\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "šakninis katalogas %s neegzistuoja\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "klaida gaunant LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Negaliu sukurti „%s“\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "negaliu sukurti „%s“ po INBOX\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "negaliu sukurti dėžutės: nepavyko LIST\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "negaliu sukurti dėžutės\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "negaliu sukurti dėžutės\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "negaliu pervadinti dėžutės: %s į %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "negaliu ištrinti dėžutės\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Gaunamos laiškų antraštės (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "klaida gaunant voką.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "negaliu išanalizuoti voko: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "nagaliu gauti voko\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie IMAP4 serverio: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Negaliu sukurti IMAP4 sesijos su: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "negalių gauti vardų zonos\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "negaliu pasirinkti katalogo: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "klaida vykdant imap komandą: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentiškumo tikrinimas nepavyko.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "nepavyko prisijungti prie IMAP4\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "negaliu prirašyti %s į %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(siunčiamas failas...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "negaliu pridėti laiško į %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "negaliu nukopijuoti %s į %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "klaida vykdant imap komandą: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "klaida vykdant imap komandą: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "klaida vykdant imap komandą: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv negali konvertuoti UTF-7 į %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv negali konvertuoti %s į UTF-7\n"
@@ -499,7 +504,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "klaida POP3 sesijoje\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "nepavyko įrašyti konfigūracijos į failą\n"
@@ -551,50 +556,50 @@ msgstr "blogas SMTP atsakymas\n"
 msgid "error occurred on SMTP session\n"
 msgstr "klaida SMTP sesijoje\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 neprieinamas\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 prieinamas\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 neprieinamas\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 prieinamas\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "SSL metodas neprieinamas\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Nežinomas SSL metodas PROGRAMOS KLAIDA\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Klaida sukuriant SSL kontekstą\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL prisijungimas naudojant %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Serverio sertifikatas:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Tema: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Leidėjas: %s\n"
@@ -653,7 +658,7 @@ msgstr ""
 "adresu „Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
 "MA 02111-1307, USA“."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -692,14 +697,14 @@ msgstr ""
 "skulpelyje „G“ jei norite gauti laiškus pasirinkę „Gauti visus“."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Vardas"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protokolas"
 
@@ -827,13 +832,13 @@ msgstr "Vartotojo veiksmo argumentas"
 msgid "Add Address to Book"
 msgstr "Įdėti adresą į knygą"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Adresai"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Pastabos"
 
@@ -846,7 +851,7 @@ msgstr "Pažymėkite adresų knygos katalogą"
 msgid "Auto-registered address"
 msgstr "Registruoti šablonai"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Failas"
@@ -867,10 +872,10 @@ msgstr "/_Failas/Naujas _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Failas/Naujas _LDAP serveris"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Failas/---"
@@ -887,21 +892,21 @@ msgstr "/_Failas/Išt_rinti"
 msgid "/_File/_Save"
 msgstr "/_Failas/Iš_saugoti"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Failas/_Užverti"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Taisa"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Taisa/Kopi_juoti"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Taisa/Į_dėti"
 
@@ -948,7 +953,7 @@ msgstr "/_Adresas/_Redaguoti"
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/Į_rankiai"
@@ -961,12 +966,12 @@ msgstr "/Į_rankiai/Importuoti _LDIF failą"
 msgid "/_Tools/Import _CSV file"
 msgstr "/Į_rankiai/Importuoti _CSV failą"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
@@ -984,7 +989,7 @@ msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1026,7 +1031,7 @@ msgstr "Adresų knyga"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Katalogas"
 
@@ -1038,17 +1043,17 @@ msgstr "El. pašto adresas"
 msgid "Search:"
 msgstr "Ieškoti:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Kam:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Slapta kopija:"
@@ -1250,7 +1255,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1306,406 +1311,411 @@ msgstr "Ruda"
 msgid "None"
 msgstr "Nieko"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Atverti"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/Pri_dėti..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Pašalinti"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Savybės..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Failas/_Siųsti"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Failas/Siųsti _vėliau"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Failas/Išsaugoti _juodraštį"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Failas/Išsaugoti ir _toliau redaguoti"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Failas/Prise_gti failą"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Failas/Įt_erpti failą"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Failas/Įterpti pa_rašą"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Failas/_Pridėti parašą"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Taisa/_Atšaukti"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Taisa/Pa_kartoti"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Taisa/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Taisa/Iškirp_ti"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Taisa/Įdėti kaip _citatą"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Taisa/Žymėti _viską"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Taisa/_Laužyti pastraipą"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Taisa/Laužyti _visas ilgas eilutes"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Taisa/_Automatiškai laužyti"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/Ro_dymas"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/Ro_dymas/_Kam"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/Ro_dymas/Ko_pija"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/Ro_dymas/_Slapta kopija"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/Ro_dymas/Kam _atsakyti"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/Ro_dymas/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/Ro_dymas/_Gija"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/Ro_dymas/_Liniuotė"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/Ro_dymas/Prise_gti failai"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr ""
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/Ro_dymas/Simbolių ko_duotė"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Ro_dymas/Simbolių ko_duotė/_Automatiškai"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/Ro_dymas/Simbolių ko_duotė/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Unikodas (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Vakarų Europos (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Vakarų Europos (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Centrinės Europos (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/_Baltų (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Baltų (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Baltų (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Graikų (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Arabų (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Arabų (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Hebrajų (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Hebrajų (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Turkų (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Supaprastinta Kinų (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Supaprastinta Kinų (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tradicinė Kinų (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Korėjiečių (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tailandiečių (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tailandiečių (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/Į_rankiai/_Adresų knyga"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/Į_rankiai/_Šablonas"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/Į_rankiai/_Veiksmai"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/Į_rankiai/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Į_rankiai/Naudoti išorinį redaktorių"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Į_rankiai/PGP _parašas"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Į_rankiai/PGP ši_fravimas"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/Į_rankiai/_Tikrinti rašybą"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/Į_rankiai/_Nustatyti kalbą"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: failas neegzistuoja\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Negaliu gauti dalies teksto\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Formato klaida."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Atsakymo/persiuntimo formato klaida."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Negaliu gauti failo „%s“ dydžio\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Failas %s yra tuščias"
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Negaliu perskaityti %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Laiškas: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Rašyti laišką%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Parašas"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Nenurodytas gavėjas."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Nėra temos"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Nenurodyta laiško tema (subject). Siųsti?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Priedai"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatiškai nustatyti šiuos adresus"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 #, fuzzy
 msgid "_Send"
 msgstr "Siųsti"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Tikrinami nauji laiškai visuose kataloguose..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1713,42 +1723,42 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant laišką %s ."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nerandu rakto susieto su pasirinktu rakto ID „%s“."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti failo rėžimo\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1759,11 +1769,11 @@ msgstr ""
 "\n"
 "Ar siųsti kaip %s?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1776,15 +1786,15 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1793,96 +1803,106 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti seno laiško\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "Laiškas dedamas į eilę...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti laiško į eilę\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Negaliu atidaryti žymų failo.\n"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Data"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Parašas"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Tikrinamas parašas"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: failas neegzistuoja\n"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Atveriamas vykdomasis failas"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1893,12 +1913,12 @@ msgstr ""
 "Jei norite jį paleisti, išsaugokite jį ir įsitikinkite ar tai ne virusas ar "
 "panaši kenkėjiška programa."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1907,48 +1927,48 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "_Derinti įrankių juostą..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -1989,7 +2009,7 @@ msgid "Nick Name"
 msgstr "Slapyvardis"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "El. pašto adresas"
 
@@ -2047,7 +2067,7 @@ msgid " Check File "
 msgstr " Patikrinti failą "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Failas"
 
@@ -2055,62 +2075,62 @@ msgstr "Failas"
 msgid "Add New Address Book"
 msgstr "Pridėti naują adresų knygą"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Turi būti nurodytas grupės pavadinimas"
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Redaguoti grupės duomenis"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Grupės pavadinimas"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Prieinami adresai"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Adresai grupėje"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Perkelkite adresus iš vienos grupės į kitą rodyklėmis"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Redaguoti grupės detales"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Pridėti naują grupę"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Redaguoti katalogą"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Įveskite katalogo pavadinimą:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Įveskite naujo katalogo pavadinimą:"
 
@@ -2127,7 +2147,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redaguoti JPilot įrašą"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2192,7 +2212,7 @@ msgstr "Skirtasis laikas (sek.)"
 msgid "Maximum Entries"
 msgstr "Įrašų maksimumas"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Pagrindinis"
 
@@ -2284,7 +2304,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Pasirinkti... "
 
@@ -2473,12 +2493,12 @@ msgstr "Nustatoma katalogo informacija...\n"
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
@@ -3315,693 +3335,703 @@ msgstr ""
 "Rasta senos versijos konfigūracija.\n"
 "Ar norite ją atnaujinti?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Failas/_Katalogas"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Failas/_Katalogas/Sukurti _naują..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Failas/_Katalogas/Pe_rvadinti..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Failas/_Katalogas/Per_kelti..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Failas/_Katalogas/_Ištrinti"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Failas/_Dėžutė"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Failas/_Dėžutė/Pridėti _naują"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Failas/_Dėžutė/_Pašalinti"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Failas/_Dėžutė/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Failas/_Dėžutė/Patikrinti ar nėra naujų laiškų"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Failas/_Dėžutė/Patikrinti visas dėžutes"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Failas/_Dėžutė/P_erkurti katalogų medį"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 #, fuzzy
 msgid "/_File/_Import mail data..."
 msgstr "/_Failas/_Importuoti „mbox“ failą..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_File/_Export mail data..."
 msgstr "/_Failas/_Eksportuoti į „mbox“ failą..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Failas/Išvaly_ti šiukšlinę"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Failas/Išsaugoti _kaip..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Failas/P_uslapio nuostatos..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Failas/_Spausdinti..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Failas/_Dirbti atsijungus"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Failas/Iš_eiti"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Taisa/Pažymė_ti giją"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Taisa/_Rasti laiške"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Taisa/_Ieškoti laiškų..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 #, fuzzy
 msgid "/_Edit/_Quick search"
 msgstr "/_Taisa/Į_dėti"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/_Katalogų medis"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/_Laiško peržiūra"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr ""
 "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta/Piktogr_amos ir tekstas"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta/Textas dešinėje"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta/P_iktogramos"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta/_Tekstas"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta/_Nieko"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/_Paieškos juosta"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/_Būsenos juosta"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/Ro_dymas/_Derinti įrankių juostą..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 #, fuzzy
 msgid "/_View/Layou_t"
 msgstr "/Ro_dymas/_Rikiuoti"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 #, fuzzy
 msgid "/_View/Layou_t/_Normal"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _siuntėją"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr ""
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/Ro_dymas/Atskirti _katalogų medį"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/Ro_dymas/Atskirti žin_utės peržiūrą"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/Ro_dymas/_Rikiuoti"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _numerį"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _dydį"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/Ro_dymas/_Rikiuoti/pagal d_atą"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Ro_dymas/_Rikiuoti/pagal gi_jos datą"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _siuntėją"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _gavėją"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _temą"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _spalvos etiketę"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/Ro_dymas/_Rikiuoti/pagal ž_ymę"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/Ro_dymas/_Rikiuoti/pagal ne_skaitytus"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _priedą"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Ro_dymas/_Rikiuoti/Ne_rikiuoti"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/Ro_dymas/_Rikiuoti/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/Ro_dymas/_Rikiuoti/_Didėjimo tvarka"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/Ro_dymas/_Rikiuoti/_Mažėjimo tvarka"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Ro_dymas/_Rikiuoti/P_agal temą"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/Ro_dymas/_Gijų peržiūra"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/Ro_dymas/Iš_skleisti visas gijas"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/Ro_dymas/Su_traukti visas gijas"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/Ro_dymas/Nustatyt_i rodomus laukus"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/Ro_dymas/_Eiti į"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Ro_dymas/_Eiti į/_Ankstesnis laiškas"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/Ro_dymas/_Eiti į/_Kitas laiškas"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/Ro_dymas/_Eiti į/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Ro_dymas/_Eiti į/Ankstesnis neskaitytas laiškas"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Ro_dymas/_Eiti į/Kitas neskaitytas laiškas"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Ro_dymas/_Eiti į/Ankstesnis naujas laiškas"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Ro_dymas/_Eiti į/Kitas naujas laiškas"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Ro_dymas/_Eiti į/Ankstesnis pažymėtas laiškas"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Ro_dymas/_Eiti į/Kitas pažymėtas laiškas"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Ro_dymas/_Eiti į/Ankstesnis laiškas su etikete"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Ro_dymas/_Eiti į/Kitas laiškas su etikete"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Ro_dymas/_Eiti į/Kitas ka_talogas"
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Ro_dymas/Simbolių ko_duotė/_Automatiškai"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Vakarų Europos (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tradicinė Kinų (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kinų (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Korėjiečių (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/Ro_dymas/Atverti naujame _lange"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/Ro_dymas/Laiško pr_adinis tekstas"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/Ro_dymas/_Visos antraštės"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/Ro_dymas/Atna_ujinti santrauką"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Laiškas"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_Laiškas/_Gauti"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Laiškas/_Gauti/Gauti iš _esamos sąskaitos"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Laiškas/_Gauti/Gauti iš _visų sąskaitų"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Laiškas/_Gauti/_Nutraukti gavimą"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Laiškas/_Gauti/Gauti iš _visų sąskaitų"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Laiškas/_Gauti/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Laiškas/_Siųsti laiškus eilėje"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Laiškas/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Laiškas/Rašyti _naują"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Laiškas/_Atsakyti"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Laiškas/Atsak_yti kam"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Laiškas/Atsak_yti kam/_visiems"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Laiškas/Atsak_yti kam/_siuntėjui"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Laiškas/Atsak_yti kam/pašto _konferencijai"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Laiškas/_Persiųsti"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Laiškas/Persiųsti kaip p_riedą"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Laiškas/Nukreip_ti"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Laiškas/Per_kelti..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Laiškas/K_opijuoti..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Laiškas/Žy_ma"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 #, fuzzy
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Laiškas/Žy_ma/Pažy_mėti"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Laiškas/Žy_ma/_Nežymėti"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Laiškas/Žy_ma/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Laiškas/Žy_ma/Ne_skaitytas"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Laiškas/Žy_ma/Skai_tytas"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Laiškas/Žy_ma/Skai_tyta gija"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Laiškas/Žy_ma/Skaityti _visi"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Laiškas/_Trinti"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Laiškas/Pažymėti kaip nepageidautiną"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Laiškas/Pažymėti kaip pageidautiną"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/P_ertaisyti"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Į_rankiai/Įrašyti siuntėją į adresų _knygą"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Į_rankiai/_Filtruoti laiškus kataloge"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Į_rankiai/Filtruoti pa_sirinktus laiškus"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/_Automatiškai"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Siuntėją"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Gavėją"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Temą"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Į_rankiai/_Filtruoti nepageidautiną paštą kataloge"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Į_rankiai/Filtruoti nepageidautinus tarp pa_sirinktų laiškų"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Į_rankiai/Ištrinti _vienodus laiškus"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 #, fuzzy
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/Į_rankiai/Ištrinti _vienodus laiškus"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/Į_rankiai/Vykdyti pažymėtus procesus"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/Į_rankiai/_Filtruoti nepageidautiną paštą kataloge"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/Į_rankiai/_Filtruoti laiškus kataloge"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/Į_rankiai/„_Logas“"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Nustatymai"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Nustatymai/Bendri _nustatymai..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Nustatymai/_Filtro nustatymai..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Nustatymai/Ša_blonai..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Nustatymai/Veiksm_ai..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 #, fuzzy
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Nustatymai/Ša_blonai..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Nustatymai/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Nustatymai/_Esamos sąskaitos nustatymai"
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Nustatymai/Sukurti _naują sąskaitą..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Nustatymai/R_edaguoti sąskaitas..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Nustatymai/Keisti esamą sąskaitą"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Pagalba/_Instrukcija"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pagalba/_Instrukcija/_English"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pagalba/_Instrukcija/_Japanese"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Pagalba/_DUK"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pagalba/_DUK/_English"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pagalba/_DUK/_German"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pagalba/_DUK/_Spanish"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pagalba/_DUK/_French"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pagalba/_DUK/_Italian"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Pagalba/_Komandinės eilutės parametrai"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Pagalba/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr ""
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr ""
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Kuriamas pagrindinis langas..\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "atlikta.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Bevardis"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "nieko"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Jūs esate atsijungęs. Prisijungti?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Išvalyti visas šiukšlines"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Ištrinti visus laiškus šiukšlinėje?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Pridėti dėžutę"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -4011,16 +4041,16 @@ msgstr ""
 "Jeigu ji egzistuoja, ji bus\n"
 "nuskaityta automatiškai."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Dėžutė"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4029,96 +4059,96 @@ msgstr ""
 "Nepavyko sukurti dėžutės.\n"
 "Galbūt kai kurie failai jau egzistuoja arba jūs neturite leidimo rašyti ten."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Katalogų peržiūra"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Laiško peržiūra"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Atsakyti"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Atsakyti _visiems"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Atsakyti _siuntėjui"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Atsakyti _konferencijai"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Persiųsti"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Pe_rsiųsti kaip priedą"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Nukreip_ti"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Tekstas piktogramos dešinėje"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "P_iktograma"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_Tekstas"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_Nieko"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Jūs esate atsijungęs. Spustelkite piktogramą jei norite prisijungti."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Jūs esate prisijungęs. Spustelkite piktogramą jei norite atsijungti."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Išeiti"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Užverti programą?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Pasirinkti katalogą"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Komandinės eilutės parametrai"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Naudojimas: sylpheed [PARAMETRAI]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4151,7 +4181,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4184,15 +4214,15 @@ msgstr ""
 "rodyti pagalbos tekstą\n"
 "rodyti versiją"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4431,236 +4461,236 @@ msgstr "Failas"
 msgid "Description: "
 msgstr "Aprašymas"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Atveriamas sąskaitos nustatymų langas...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Sąskaita%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Naujos sąskaitos nustatymai"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Sąskaitos nustatymai"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Sukuriamas sąskaitos nustatymų langas...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Gauti"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Siųsti"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Rašyti"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Privatumas"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Papildomi"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Sąskaitos vardas"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Pažymėti kaip įprastą"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Asmeninė informacija"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Pilnas vardas"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "El. pašto adresas"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Severio informacija"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Naujienos (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Vietinis"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Serveris reikalauja patvirtinti autentiškumą"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Naujienų serveris"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Serveris pašto gavimui"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "SMTP serveris (siuntimui)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Vartotojo ID"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Naudoti saugų autentiškumo tikrinimą (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Po gavimo pašalinti laiškus iš serverio"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Pašalinti po"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "dienų"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 dienų: pašalinti iš karto"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Atsisiųsti visus laiškus serveryje (įskaitant jau gautus)"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Dydžio limitas"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtruoti laiškus gaunant"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Gaunamų laiškų dėžutė"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Nefiltruoti laiškai bus laikomos šiame kataloge."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Autentiškumo patikrinimo metodas"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Tikrinti tik INBOX"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtruoti laiškus gaunant"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Naujienos"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Maksimalus parsiunčiamų laiškų skaičius"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Nelimituojama, jei nurodyta „0“."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "„Gauti visus“ tinkrina paštą šioje sąskaitoje"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Antraštė"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Pridėti „Date“ antraštės lauką"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Generuoti „Message-ID“"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Pridėti vartotojo nustatytas antraštes"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Redaguoti... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Autentiškumo patikrinimas"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP autentiškumo patikrinimas (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4668,246 +4698,250 @@ msgstr ""
 "Jei paliksite šiuos laukus tuščius, bus naudojamas tas pats vartotojo ID ir "
 "slaptažodis kaip ir gaunant."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Prieš siunčiant patikrinti autentiškumą su POP3"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Parašas"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Vardas:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Komandos išvestis"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automatiškai nustatyti šiuos adresus"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "Pasirašyti laiškus su PGP"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "Koduoti laiškus su PGP"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Koduoti kai atsakoma į koduotą laišką"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Naudoti „ASCII-armored“ formatą kodavimui"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Naudoti „clear text“ parašą"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Naudoti numatytąjį GnuPG raktą"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Parinkti raktą pagal jūsų el. pašto adresą"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Nurodyti raktą"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Vartotojo arba rakto ID"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Nenaudoti SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Naudoti SSL POP3 prisijungimui"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Naudoti STARTTLS komandą SSL sesijos pradžiai"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Naudoti SSL IMAP4 prisijungimui"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Naudoti SSL NNTP prisijungimui"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Siuntimas (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Naudoti SSL SMTP prisijungimui"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Naudoti „non-blocking SSL“"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Išjunkite, jei turite problemų su SSL prisijungimais."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 #, fuzzy
 msgid "Hostname:"
 msgstr "Vardas (hostname)"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 #, fuzzy
 msgid "Port:"
 msgstr "Prievadas"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 #, fuzzy
 msgid "Use authentication"
 msgstr "Autentiškumo patikrinimas"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Vardas:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 #, fuzzy
 msgid "Password:"
 msgstr "Slaptažodis"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 #, fuzzy
 msgid "Use SOCKS proxy on sending"
 msgstr "Naudoti išorinę programą siuntimui"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Nurodykite SMTP prievadą"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Nurodykite POP3 prievadą"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Nurodykite IMAP4 prievadą"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Nurodykite NNTP prievadą"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Nurodykite domeno vardą"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP serverio katalogas"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Bus rodomi tik šio katalogo pakatalogiai."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Išvalyti laiškų laikinas kopijas (cache) išeinant"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Siųstus laiškus dėti į"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Juodraščius dėti į"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Laiškų eilę dėti į"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Ištrintus laiškus dėti į"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Neįvestas sąskaitos pavadinimas."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Neįvestas pašto adresas."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Neįvestas SMTP serveris."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Neįvestas vartotojo ID."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Neįvestas POP3 serveris."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Neįvestas IMAP4 serveris."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Neįvestas NNTP serveris."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Nurodytas ne eilės katalogas."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/nl.po b/po/nl.po
index 82acc0c0..f04f0516 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 3.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2012-05-07 03:15+0200\n"
 "Last-Translator: Ward De Ridder <ward@warddr.eu>\n"
 "Language-Team: \n"
@@ -31,205 +31,210 @@ msgstr "Spamfilter (handmatig)"
 msgid "Junk mail filter"
 msgstr "Spamfilter"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "IMAP4 verbinding naar %s is verbroken. Contact wordt opnieuw gelegd...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 server schakelt LOGIN uit.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "Kan IMAP verbinding niet tot stand brengen.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "IMAP4 verbinding naar %s:%d wordt opgezet...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Kan geen TLS sessie starten.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(ontvangen van FLAGS...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "Ophalen van bericht %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Berichten toevoegen aan %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Berichten %s worden verplaatst naar %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Berichten %s worden gekopieerd naar %s..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Berichten %s worden verwijderd"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan verwijderd-vlaggen niet instellen: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "kan niet wissen\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Alle berichten in %s worden verwijderd"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan de verwijderd-vlaggen niet instellen: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "kan map niet sluiten\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "De beginmap %s bestaat niet\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "er is een fout opgetreden bij het ophalen van de lijst.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr ""
 "kan %s niet aanmaken\n"
 "\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan %s niet aanmaken onder INBOX\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan geen mailbox maken: LIST mislukt\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "kan geen mailbox maken\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "kan geen mailbox maken\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan de mailbox niet hernoemen van %s naar %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "kan de mailbox niet verwijderen\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Ophalen van berichtkoppen (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "Er is een fout opgetreden bij het verkrijgen van de envelop.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan de envelop niet verwerken: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "kan de envelop niet verkrijgen\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan niet verbinden met de IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kan gaan sessie opzetten met de IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "kan de NAMESPACE niet vinden\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "Fout bij IMAP-opdracht: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-identificatie mislukt.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login mislukt.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan %s niet toevoegen aan %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(bestand wordt verzonden...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kan bericht niet toevoegen aan %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan %s niet naar %s kopiëren\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fout bij IMAP-opdracht: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "Fout bij IMAP-opdracht: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
@@ -507,7 +512,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "er is een fout opgetreden tijdens de POP3-sessie\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "opslaan van de configuratie is mislukt\n"
@@ -559,50 +564,50 @@ msgstr "ongeldige SMTP-reactie\n"
 msgid "error occurred on SMTP session\n"
 msgstr "er is een fout opgetreden tijdens de SMTP-sessie\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 niet beschikbaar\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSL v23 beschikbaar\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 niet beschikbaar\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 beschikbaar\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "SSL methode niet beschikbaar\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Onbekende SSL methode *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Fout bij het maken van de ssl context\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL verbinding met %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Server-certificaat:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Onderwerp: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Uitgever: %s\n"
@@ -663,7 +668,7 @@ msgstr ""
 "bij de Free Software Foundation Inc., 59 Temple Place - Suite 330, Boston, "
 "MA 02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -701,14 +706,14 @@ msgstr ""
 "u op de knop 'Alles ophalen' klikt."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Naam"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -837,13 +842,13 @@ msgstr "Gebruikersargumenten voor actie"
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Adres"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Opmerkingen"
 
@@ -855,7 +860,7 @@ msgstr "Selecteer adresboekmap"
 msgid "Auto-registered address"
 msgstr "Automatisch geregistreerd adres"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Bestand"
@@ -876,10 +881,10 @@ msgstr "/_Bestand/Nieuwe _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Bestand/Nieuwe _LDAP-server"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Bestand/---"
@@ -896,21 +901,21 @@ msgstr "/_Bestand/_Verwijderen"
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/Be_werken/_Kopiëren"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/Be_werken/_Plakken"
 
@@ -954,7 +959,7 @@ msgstr "/_Adres/_Bewerken"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Gereedschap"
@@ -967,12 +972,12 @@ msgstr "/_Gereedschap/_LDIF bestand importeren"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Gereedschap/CSV bestand importeren"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
@@ -990,7 +995,7 @@ msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1032,7 +1037,7 @@ msgstr "Adresboek"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Accounts"
 
@@ -1044,17 +1049,17 @@ msgstr "E-mail adres"
 msgid "Search:"
 msgstr "Zoeken:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Aan:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1262,7 +1267,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1318,403 +1323,408 @@ msgstr "Bruin"
 msgid "None"
 msgstr "Geen"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/Openen"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Toevoegen..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Verwijderen"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Eigenschappen..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Bericht/_Verzenden"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Bericht/_Later verzenden"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Bericht/Klad _opslaan"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Bericht/Opslaan en blijven bewer_ken"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Bestand/_Bijlage toevoegen"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Bestand/Bestand _invoegen"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Bestand/_Handtekening invoegen"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Bericht/Handtekening _toevoegen"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/Be_werken/_Ongedaan maken"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/Be_werken/O_pnieuw toepassen"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/Be_werken/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/Be_werken/K_nippen"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Be_werken/Plakken als _citaat"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/Be_werken/_Alles selecteren"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Be_werken/Regelterugloop in deze paragraaf"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Be_werken/Regelterugloop in hele bericht"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Be_werken/Regel_terugloop automatisch"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/Beel_d"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/Beel_d/_Aan"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/Beel_d/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/Beel_d/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/Beel_d/Ant_woord naar"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/Beel_d/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/Be_richt/_Vervolg op"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/Beel_d/_Lineaal"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/Beel_d/_Bijlage"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Beel_d/Werkbalk aanpassen..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/Beel_d/_Tekstcodering"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Beel_d/_Tekstcodering/_Automatisch"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/Beel_d/_Tekstcodering/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Beel_d/_Tekstcodering/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Beel_d/_Tekstcodering/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Beel_d/_Tekstcodering/Centraaleuropees (ISO-8859-2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Beel_d/_Tekstcodering/Baltisch (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Beel_d/_Tekstcodering/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Beel_d/_Tekstcodering/Baltisch (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Beel_d/_Tekstcodering/Grieks (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Beel_d/_Tekstcodering/Hebreeuws (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Beel_d/_Tekstcodering/Hebreeuws (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Beel_d/_Tekstcodering/Turks (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (KOI8-_U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Beel_d/_Tekstcodering/Japans (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Beel_d/_Tekstcodering/Vereenvoudigd Chinees (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Beel_d/_Tekstcodering/Vereenvoudigd Chinees (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Beel_d/_Tekstcodering/Traditioneel Chinees (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Beel_d/_Tekstcodering/Koreaans (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Beel_d/_Tekstcodering/Thais (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Beel_d/_Tekstcodering/Thais (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Gereedschap/_Adresboek"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Gereedschap/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Gereedschap/Be_werken met externe editor"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Gereedschap/Verzoek om notificatie indien gelezen"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Gereedschap/_Ondertekenen met PGP"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Be_richt/_Coderen met PGP"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Gereedschap/_Spellingscontrole"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Gereedschap/_Taal voor spellingscontrole instellen"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: bestand bestaat niet\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan een deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Tekenen"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Geen onderwerp"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Bijlage ontbreekt"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Er is geen bijlage. Zonder bijlage versturen?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Controleer geadresseerden"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Dit bericht werkelijk naar de volgende adressen versturen?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "Verzenden"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1722,12 +1732,12 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, 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:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
@@ -1735,29 +1745,29 @@ msgstr ""
 "Het bericht is succesvol verstuurd, maar kon niet in 'Verzonden' worden "
 "opgeslagen."
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Kon geen bijpassende sleutel vinden voor geselecteerde sleutel-id `%s'."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "Kan het bericht niet ondertekenen."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "Kan het bericht niet coderen."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "Kan het bericht niet coderen of ondertekenen."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1768,11 +1778,11 @@ msgstr ""
 "\n"
 "Toch versturen als %s?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Fout bij coderingsconversie"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1785,15 +1795,15 @@ msgstr ""
 "\n"
 "Toch versturen?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Maximale regellengte"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Coderen met Bcc"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1807,94 +1817,104 @@ msgstr ""
 "\n"
 "Toch versturen?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Bestand %s bestaat niet."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Kan het bestand %s niet openen."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Ondertekenen met PGP"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Datumtype"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Tekenen"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Bezig met verifiëren handtekening"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME-type"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "Bestand bestaat niet."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Openen van uitvoerbaar bestand"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1906,12 +1926,12 @@ msgstr ""
 "Als u het wilt uitvoeren, dient u het bestand ergens op te slaan en te "
 "controleren om virussen geen kans te geven."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Het opgegeven commando voor de externe editor is onjuist: '%s'\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1920,48 +1940,48 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "/Werkbalk aanpassen"
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Kan het bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -2002,7 +2022,7 @@ msgid "Nick Name"
 msgstr "Alias"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-mail adres"
 
@@ -2060,7 +2080,7 @@ msgid " Check File "
 msgstr " Controleer bestand"
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Bestand"
 
@@ -2068,63 +2088,63 @@ msgstr "Bestand"
 msgid "Add New Address Book"
 msgstr "Adresboek toevoegen"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "U moet wel een groepsnaam geven."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Groepsgegevens bewerken"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Groepsnaam"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Beschikbare adressen"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->"
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-"
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Adressen in groep"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "Verplaats e-mail adressen van en naar de nieuwe groep met de pijl-knoppen"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Groepsdetails bewerken"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Nieuwe groep toevoegen"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Map hernoemen"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -2141,7 +2161,7 @@ msgid "Edit JPilot Entry"
 msgstr "Bewerk JPilot veld"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ..."
@@ -2206,7 +2226,7 @@ msgstr "Timeout (sec)"
 msgid "Maximum Entries"
 msgstr "Maximum aantal velden"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Algemeen"
 
@@ -2293,7 +2313,7 @@ msgid "MH (number only)"
 msgstr "MH (alleen nummer)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Selecteer..."
 
@@ -2477,12 +2497,12 @@ msgstr "Mapinfo wordt ingesteld...\n"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
@@ -3315,682 +3335,692 @@ msgstr ""
 "De gevonden configuratie is van een oude versie.\n"
 "Wilt u deze omzetten?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Bestand/_Map"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Bestand/_Map/Nieuwe map aanmaken..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Bestand/_Map/Map _hernoemen..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Bestand/_Map/Map ver_plaatsen..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Bestand/_Map/Map ver_wijderen"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Bestand/_Postbus"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Bestand/_Postbus/Toevoegen..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Bestand/_Postbus/_Verwijderen"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Bestand/_Postbus/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Bestand/_Postbus//Nieuwe e-mail _ophalen"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Bestand/_Postbus/Nieuwe e-mail ophalen voor _alle accounts"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Bestand/_Postbus/_Mappenlijst opnieuw opbouwen"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_Bestand/Importeer e-mail berichten"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_Bestand/Exporteer e-mail berichten"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Bestand/Prullenbak _legen"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Bestand/Opslaan _als..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Bestand/Paginainstellingen..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Bestand/Af_drukken..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Bestand/Off-line werken"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Bestand/A_fsluiten"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/Be_werken/_Discussie selecteren"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/Be_werken/Zoeken in bericht..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/Be_werken/Berichtenlijst door_zoeken..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/Be_werken/Snel zoeken"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/Beel_d/_Hoofdvenster"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Beel_d/_Hoofdvenster/_Accountlijst"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Beel_d/_Hoofdvenster/_Bericht"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/Afbeelding _en tekst"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/Tekst rechts van icoon"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/_Afbeelding"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/_Tekst"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/_Niet weergeven"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Beel_d/_Hoofdvenster/_Zoekbalk"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Beel_d/_Hoofdvenster/Status_balk"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/Beel_d/Werkbalk aanpassen"
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/Beel_d/Layout"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/Beel_d/Layout/Normaal"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/Beel_d/Layout/_Verticaal"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/Beel_d/Acc_ountlijst los"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/Beel_d/_Bericht los"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/Beel_d/_Sorteren"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/Beel_d/_Sorteren/Op _nummer"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Beel_d/_Sorteren/Op _grootte"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/Beel_d/_Sorteren/Op _datum"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Beel_d/_Sorteren/Op datum (dis_cussie)"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/Beel_d/_Sorteren/Op _afzender"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Beel_d/_Sorteren/Op _ontvanger"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/Beel_d/_Sorteren/Op _onderwerp"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/Beel_d/_Sorteren/Op _kleurlabel"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/Beel_d/_Sorteren/Op _markering"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/Beel_d/_Sorteren/Op on_gelezen"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Beel_d/_Sorteren/Op _bijvoeging"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Beel_d/_Sorteren/_Ongesorteerd"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/Beel_d/_Sorteren/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/Beel_d/_Sorteren/Oplopend"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/Beel_d/_Sorteren/Aflopend"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Beel_d/_Sorteren/Aantrekken op onderwerp"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/Beel_d/Ge_nest"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/Beel_d/Discussies _uitklappen"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/Beel_d/Discussies _inklappen"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/Beel_d/_Kolommen berichtenlijst..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/Beel_d/_Ga naar"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Beel_d/_Ga naar/_Vorige bericht"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/Beel_d/_Ga naar/Vo_lgende bericht"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/Beel_d/_Ga naar/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Beel_d/_Ga naar/Vo_rige ongelezen bericht"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Beel_d/_Ga naar/Volgende on_gelezen bericht"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Beel_d/_Ga naar/_Vorige nieuwe bericht"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Beel_d/_Ga naar/Vo_lgende nieuwe bericht"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Beel_d/_Ga naar/Vorige ge_markeerd bericht"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Beel_d/_Ga naar/Volgende gem_arkeerd bericht"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Beel_d/_Ga naar/Vorige gela_beld bericht"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Beel_d/_Ga naar/Volgende gelab_eld bericht"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Beel_d/_Ga naar/Andere _map..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Beel_d/_Tekstcodering/Automatisch"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Beel_d/_Tekstcodering/Japans (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Beel_d/_Tekstcodering/Japans (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Beel_d/_Tekstcodering/Japans (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Beel_d/_Tekstcodering/Traditioneel Chinees (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Beel_d/_Tekstcodering/Chinees (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Beel_d/_Tekstcodering/Koreaans (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/Beel_d/In _nieuw venster openen"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/Beel_d/_Broncode weergeven"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/Beel_d/Alle kopteksten"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/Beel_d/_Verversen"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/Be_richt"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/Be_richt/_Ophalen"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Be_richt/_Ophalen/E-mail van _huidig account ophalen"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Be_richt/_Ophalen/Alle e-mail ophalen"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/Be_richt/_Ophalen/Ophalen afbreken"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/Be_richt/_Ophalen/Mailbox op andere computer"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/Be_richt/_Ophalen/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/Be_richt/Berichten uit wachtrij verzenden"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/Be_richt/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/Be_richt/_Nieuw bericht opstellen"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/Be_richt/_Beantwoorden"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/Be_richt/Antwoord _sturen aan"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Be_richt/Antwoord _sturen aan/_iedereen"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Be_richt/Antwoord _sturen aan/_afzender"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Be_richt/Antwoord _sturen aan/_discussielijst"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/Be_richt/_Doorsturen"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/Be_richt/Doorsturen _als bijlage"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/Be_richt/Om_leiden"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/Be_richt/_Verplaatsen..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/Be_richt/_Kopiëren..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/Be_richt/_Markeren"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/Be_richt/_Markeren/Aanvinken"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/Be_richt/_Markeren/Afvinken"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/Be_richt/_Markeren/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Be_richt/_Markeren/Als _ongelezen"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Be_richt/_Markeren/Als _gelezen"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Be_richt/_Markeren/Als _gelezen (discussie)"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Be_richt/_Markeren/_Alles gelezen"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/Be_richt/Ver_wijderen"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/Be_richt/Als _spam markeren"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Be_richt/Als _niet spam markeren"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Gereedschap/Af_zender toevoegen aan adresboek..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Gereedschap/Alle berichten _filteren"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Gereedschap/_Geselecteerde berichten filteren"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Gereedschap/Filterregel _aanmaken"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Gereedschap/_Creëer Filterregel/_Automatisch"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Gereedschap/_Creëer filterregel/voor A_fzender"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Geadresseerde"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Onderwerp"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Gereedschap/_Spam filteren"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Gereedschap/Spam filteren uit ge_selecteerde berichten"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Gereedschap/Du_bbele berichten verwijderen"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Gereedschap/Gescheiden berichten samenvoegen"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Gereedschap/Voer gemarkeerd proces uit"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Gereedschap/_Spam filteren"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Gereedschap/Alle berichten _filteren"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Gereedschap/_Logboek"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Instellingen"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Instellingen/Algemene voorkeuren..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Instellingen/_Filterbeheer..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Instellingen/_Sjablonen..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Instellingen/A_cties..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Instellingen/Plug-in beheer..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Instellingen/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Instellingen/Accountvoorkeuren..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Instellingen/Nieuw account aanmaken..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Instellingen/Accountbeheer..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Instellingen/Huidig account veranderen"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Hulp/_Handboek"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hulp/_Handboek/_Engels"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hulp/_Handboek/_Japans"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Hulp/_FAQ"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hulp/_FAQ/_Engels"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hulp/_FAQ/_Duits"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hulp/_FAQ/_Spaans"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hulp/_FAQ/_Frans"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hulp/_FAQ/_Italiaans"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Hulp/Opties voor de opdrachtregel"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Hulp/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/_Hulp/Controleer op nieuwere versie..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/_Hulp/Controleer op nieuwere versies van plug-ins..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Hoofdvenster wordt aangemaakt...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "klaar.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Geen titel"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Off-line"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "U bent off-line aan het werken. Wilt u on-line gaan?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Prullenbakken legen"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Alle berichten uit de prullenbakken weggooien?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Mailbox toevoegen"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -4000,16 +4030,16 @@ msgstr ""
 "Als een bestaande mailbox wordt ingevuld,\n"
 "dan wordt hij automatisch ingelezen."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4019,99 +4049,99 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappenoverzicht"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/_Iedereen beantwoorden"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/_Afzender beantwoorden"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/_Discussielijst beantwoorden"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Icoon en tekst"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Tekst rechts van icoon"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "Icoon"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "Tekst"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "Geen"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "U bent off-line aan het werken. Klik op het pictogram om on-line te gaan "
 "werken."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 "U bent on-line aan het werken. Klik op het pictogram om off-line te gaan "
 "werken."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "De geselecteerde berichten konden niet worden samengevoegd."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Selecteer map om te openen"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Opties voor de opdrachtregel"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Gebruik: sylpheed [OPTIES]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4143,7 +4173,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4176,15 +4206,15 @@ msgstr ""
 "dit bericht weergeven\n"
 "versieinformatie weergeven"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Optie alleen voor Windows:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "specificeer poort voor IPC commando's op afstand"
 
@@ -4417,237 +4447,237 @@ msgstr "Bestand:"
 msgid "Description: "
 msgstr "Beschrijving:"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Voorkeuren voor nieuw account"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Accountvoorkeuren"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Venster accountvoorkeuren wordt geopend...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Ontvangen"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Verzenden"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Opstellen"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Naam van dit account"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Instellen als standaard"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organisatie"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Serverinformatie"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Nieuws (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Niets (lokaal)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Deze server vereist authentificatie"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Nieuwsserver"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Server om van te ontvangen"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "SMTP server (om te verzenden)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Gebruikersnaam"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Veilige identificatie gebruiken (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Verwijder berichten op de server wanneer ze worden opgehaald"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Verwijderen na"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "dagen"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 dagen: direct verwijderen"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr ""
 "Haal alle berichten op van de server, inclusief reeds opgehaalde berichten"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Limiet ontvangstgrootte"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "kB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filter de berichten bij het ophalen"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Standaard inbox"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Ongefilterde berichten zullen hier opgeslagen worden"
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Identificatiemethode"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Alleen de INBOX op nieuwe e-mail controleren"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filter de nieuwe berichten bij het ophalen"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Nieuws"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Maximum aantal te downloaden artikelen"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Geen limiet als 0 is ingesteld."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Alles ophalen' haalt de e-mail voor dit account op"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Datum veld toevoegen aan header"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Bericht-ID aanmaken"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Bewerken..."
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Identificatie"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP identificatie (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4655,241 +4685,245 @@ msgstr ""
 "Als u deze ingangen niet invult, zal hetzelfde naam/wachtwoord-paar gebruikt "
 "worden als voor het ontvangen."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Identificatie met POP3 voor het verzenden"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Tekenen"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Directe invoer"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Naam:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Resultaat van opdracht"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Invoegen van handtekening voor citaat (niet aanbevolen)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Stel automatisch de volgende adressen in"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Antwoorden aan"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "Standaard een PGP-identificatiehandtekening toevoegen"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "Standaard het bericht coderen met PGP"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Versleutelen indien reactie op versleuteld bericht"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII-versterkt formaat gebruiken voor codering"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Teksthandtekening gebruiken"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Gebruik standaard GnuPG sleutel"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Selecteer sleutel naar e-mail adres"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Specificeer sleutel handmatig"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Gebruikers- of sleutel-ID:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Geen SSL gebruiken"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "SSL gebruiken voor POP3 verbinding"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Het STARTTLS commando gebruiken om een SSL sessie te starten"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL gebruiken voor IMAP verbinding"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "SSL gebruiken voor NNTP verbinding"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Verzenden (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "SSL gebruiken voor SMTP verbinding"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Niet-blokkerende SSL gebruiken"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Zet dit uit als u problemen met de SSL-verbinding heeft."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "Gebruik SOCKS-proxy"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Hostnaam:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Gebruik authenticatie"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Naam:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Gebruik SOCKS-proxy bij verzenden"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "SMTP poort"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "POP3 poort"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 poort"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "SMTP poort"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Specificeer domeinnaam"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP server-map"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Alleen de submappen van deze map zullen weergegeven worden."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Alle buffers legen bij afsluiten"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Verzonden berichten opslaan in"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Kladberichten opslaan in"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Wachtrijberichten opslaan in"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Verwijderde berichten opslaan in"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Accountnaam is niet ingevuld."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "E-mail adres is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "SMTP server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Gebruikersnaam is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "POP3 server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "NNTP server is niet ingevoerd."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Aangegeven map kan niet gebruikt worden als wachtrij."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/pl.po b/po/pl.po
index da3d37f1..8ab71a44 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2011-01-07 12:00+0100\n"
 "Last-Translator: Jan Stępień <jstepien@users.sourceforge.net>\n"
 "Language-Team: Jan Stępień <jstepien@users.sourceforge.net>\n"
@@ -24,203 +24,208 @@ msgstr "Filtr niechcianej poczty (ręczny)"
 msgid "Junk mail filter"
 msgstr "Filtr niechcianej poczty"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "Połączenie IMAP4 z %s zostało przerwane. Ponowne nawiązywanie połączenia...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr ""
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "Nie udało się ustanowić połączenia IMAP.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "tworzenie połączenia IMAP4 do %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Nie można uruchomić sesji TLS\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "Pobieranie wiadomości %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Dodawanie wiadomości do %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Przenoszenie wiadomości %s do %s"
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiowanie wiadomości %s do %s"
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Usuwanie wiadomości %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nie można ustawić flag skasowany: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "nie można zlikwidować\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Usuwanie wszystkich wiadomości w %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nie można ustawić flagi skasowany: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "nie można zamknąć katalogu\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "brak głównego katalogu %s\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "wystąpił błąd podczas przy pobieraniu LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "nie można utworzyć \"%s\"\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "nie można utworzyć \"%s\" w INBOX\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nie można utworzyć skrzynki: błąd LIST.\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "nie można utworzyć skrzynki\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "nie można utworzyć skrzynki\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nie można zmienić nazwy skrzynki: %s na %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "nie można skasować skrzynki\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Pobieranie nagłówków wiadomości (%d/%d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "wystąpił błąd podczas pobierania koperty.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nie można przetworzyć koperty: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "nie można pobrać koperty\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nie można nawiązać połączenia z serwerem IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nie można ustanowić sesji IMAP4 z: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "nie można pobrać przestrzeni nazw\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nie można wybrać katalogu: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "błąd polecenia IMAP: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "Błąd uwierzytelniania IMAP4.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Nie można zalogować się do serwera IMAP4.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nie można dołączyć %s do %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(wysyłanie pliku...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nie można dołączyć wiadomości do %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nie można skopiować %s do %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "nie można skonwertować UTF-7 do %s za pomocą programu iconv\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "nie można skonwertować %s do UTF-7 za pomocą programu iconv\n"
@@ -490,7 +495,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "wystąpił błąd podczas sesji POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "błąd podczas zapisu konfiguracji do pliku\n"
@@ -542,50 +547,50 @@ msgstr "nieprawidłowa odpowiedź SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "wystąpił błąd w sesji SMTP\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 niedostępny\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 dostępny\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 niedostępny\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 dostępny\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "Niedostępna metoda SSL\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Nieznana metoda SSL *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Błąd tworzenia kontekstu ssl\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Połączenie SSL z użyciem %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Ceryfikat serwera:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "Temat: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Nadawca: %s\n"
@@ -646,7 +651,7 @@ 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_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -683,14 +688,14 @@ msgstr ""
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protokół"
 
@@ -818,13 +823,13 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Adres"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Uwagi"
 
@@ -836,7 +841,7 @@ msgstr "Wybierz katalog książki adresowej"
 msgid "Auto-registered address"
 msgstr "Adresy zebrane automatycznie"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Plik"
@@ -857,10 +862,10 @@ msgstr "/_Plik/Nowy _J-Pilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Plik/Nowy serwer _LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Plik/---"
@@ -877,21 +882,21 @@ msgstr "/_Plik/_Usuń"
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
@@ -938,7 +943,7 @@ msgstr "/_Adres/_Edycja"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Narzędzia"
@@ -951,12 +956,12 @@ msgstr "/_Plik/Importuj plik _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Narzędzia/Importuj plik _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
@@ -974,7 +979,7 @@ msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1016,7 +1021,7 @@ msgstr "Książka adresowa"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Katalog"
 
@@ -1028,17 +1033,17 @@ msgstr "Adres e-mail"
 msgid "Search:"
 msgstr "Szukaj: "
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Do:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
@@ -1245,7 +1250,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1301,404 +1306,409 @@ msgstr "Brązowy"
 msgid "None"
 msgstr "Brak"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Otwórz"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/Dod_aj..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Usuń"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Właściwości..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Plik/Wyślij"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Plik/Wyś_lij później"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Plik/Zapisz w katalogu _szablonów"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Plik/Zapisz i kontynuuj _edycję"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Plik/_Dołącz plik"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Plik/Wstaw pl_ik"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Plik/Wstaw p_odpis"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Plik/Dołącz p_odpis"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Edycja/_Cofnij"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Edycja/Po_nów"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Edycja/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Edycja/Wy_tnij"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Edycja/Wstaw jako c_ytat"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Edycja/W_ybierz wszystko"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Edit/Za_wiń bieżący akapit"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Edycja/Zawijaj wszystkie długie _linie"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Edycja/Aut_o-zawijanie"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Widok"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Widok/_Do"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Widok/_Kopia"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Widok/_Ukryta kopia"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/_Widok/_Odpowiedz do"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Widok/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Widok/_Przekaż do"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Widok/_Linijka"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Widok/Załączniki"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Widok/Dostosuj katalog..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Widok/Kodowani_e znaków/Automatyczne"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Widok/Kodowani_e znaków/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Widok/Kodowani_e znaków/7-bitowe ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Widok/Kodowani_e znaków/Unikod (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Środkowa (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Widok/Kodowani_e znaków/_Bałtyckie (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Widok/Kodowani_e znaków/Greckie (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Widok/Kodowani_e znaków/Arabskie (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Widok/Kodowani_e znaków/Arabskie (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Widok/Kodowani_e znaków/Tureckie (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Narzędzia/_Książka adresowa"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzędzia/Polecen_ia"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Narzędzia/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Narzędzia/Edytuj za pomocą z_ewnętrznego edytora"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Narzędzia/Podpis _PGP"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Narzędzia/Szyfrowani_e GPG"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Narzędzia/_Sprawdź pisownię"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Narzędzia/_Zmień język sprawdzania pisowni"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: brak pliku\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Nie mogę pobrać części tekstu\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Błąd formatu znacznika cytatu."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Błąd formatu odpowiedz/przekaż wiadomość."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Tworzenie wiadomości%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Podpis"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Pusty temat"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Brak załącznika"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Nie ma załączników. Wysłać bez załącznika?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Sprawdź odbiorców"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Na pewno wysłać tę wiadomość do następujących odbiorców?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Temat:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "_Wyślij"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1706,40 +1716,40 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, 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:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "Nie można podpisać wiadomości."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "Nie można zaszyfrować wiadomości."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "Nie można zaszyfrować lub podpisać wiadomości."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1749,11 +1759,11 @@ msgstr ""
 "Nie można przekonwertować treści wiadomości z %s na %s.\n"
 "Wysłać wiadomość mimo to w %s ?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr ""
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1762,15 +1772,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Limit długości linii"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Szyfrowanie z odbiorcami ukrytej kopii"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 #, fuzzy
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
@@ -1786,94 +1796,104 @@ msgstr ""
 "\n"
 "Wysłać mimo to?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Plik %s nie istnieje."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nie można otworzyć pliku %s."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Typ danych"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Podpis"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Sprawdzanie podpisu"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "Plik nie istnieje."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Otwieranie pliku wykonywalnego"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1885,12 +1905,12 @@ msgstr ""
 "Aby go uruchomić, zapisz go gdzieś i upewnij się, że nie jest to wirus bądź "
 "inny niepożądany program."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1899,48 +1919,48 @@ msgstr ""
 "Zewnętrzny edytor wciąż pracuje.\n"
 "Czy wymusić zakończenie procesu (pid: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "_Dostosuj pasek narzędzi..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Zapisz wiadomość"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmodyfikowana. Zapisać ją w folderze szkiców?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Zamień"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Wstaw"
 
@@ -1981,7 +2001,7 @@ msgid "Nick Name"
 msgstr "Pseudonim"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Adres e-mail"
 
@@ -2039,7 +2059,7 @@ msgid " Check File "
 msgstr " Sprawdź plik"
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Plik"
 
@@ -2047,62 +2067,62 @@ msgstr "Plik"
 msgid "Add New Address Book"
 msgstr "Dodaj nową książkę adresową"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Należy podać nazwę grupy."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Edytuj dane grupy"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Nazwa grupy"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Dostępne adresy"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Adresy w grupie"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Przenieś przyciskami strzałek adresy email do lub z grupy"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Edytuj szczegóły grupy"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Dodaj nową grupę"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Edytuj katalog"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Podaj nową nazwę katalogu:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
@@ -2119,7 +2139,7 @@ msgid "Edit JPilot Entry"
 msgstr "Edytuj wpis JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2184,7 +2204,7 @@ msgstr "Opóźnienie (sek)"
 msgid "Maximum Entries"
 msgstr "Maksymalna ilość pozycji"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Podstawowe"
 
@@ -2270,7 +2290,7 @@ msgid "MH (number only)"
 msgstr "MH (tylko numery)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Wybierz... "
 
@@ -2456,12 +2476,12 @@ msgstr "Ustawianie informacji o katalogu...\n"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
@@ -3294,695 +3314,705 @@ msgstr ""
 "Znaleziono starą wersję konfiguracji.\n"
 "Czy chcesz dokonać migracji?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Plik/_Katalog"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Plik/_Katalog/Utwórz _nowy katalog..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Plik/_Katalog/_Zmień nazwę katalo_gu..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Plik/_Katalog/_Przenieś katalog..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Plik/_Katalog/_Usuń kata_log"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Plik/S_krzynka"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Plik/S_krzynka/Dod_aj skrzynkę..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Usuń _skrzynkę"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Plik/S_krzynka/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Plik/S_krzynka/Sprawdź nowe wiadomoś_ci"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Plik/S_krzynka/Sprawdź wiadomoś_ci we wszystkich skrzynkach"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Plik/S_krzynka/Odbuduj drz_ewo katalogów"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 #, fuzzy
 msgid "/_File/_Import mail data..."
 msgstr "/_Plik/_Importuj plik mbox..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_File/_Export mail data..."
 msgstr "/_Plik/_Eksportuj do pliku mbox..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Plik/Opróżnij śmie_tnik"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Plik/Zapi_sz jako..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Plik/_Ustawienia strony..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Plik/_Drukuj..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Plik/Praca _offline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Plik/_Koniec"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Edycja/Wybierz wą_tek"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edycja/Zna_jdź w bieżącej wiadomości..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edycja/Wy_szukaj wiadomości..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/_Edycja/Sz_ybkie wyszukiwanie"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Widok/Wyświetl lub _ukryj"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Drzewo katalogów"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Widok/Wyświetl lub _ukryj/Widok wiado_mości"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/I_kony i tekst"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/Tekst na _prawo od ikon"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Ikony"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Tekst"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/Żade_n"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Widok/Wyświetl lub _ukryj/Pasek _wyszukiwania"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Widok/Wyświetl lub _ukryj/Pa_sek stanu"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Widok/Dostosuj pasek _narzędzi..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/_Widok/_Układ"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Widok/_Układ/_Normalny"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/_Widok/_Układ/_Pionowy"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Widok/_Oddzielne drzewo katalogów"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Widok/Oddzielny widok wiado_mości"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Widok/_Sortuj"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Widok/_Sortuj/wg _numeru"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Widok/_Sortuj/wg w_ielkości"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Widok/_Sortuj/wg _daty"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Widok/_Sortuj/wg _daty wątku"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Widok/_Sortuj/wg pola _od"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Widok/_Sortuj/wg odbio_rcy"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Widok/_Sortuj/wg _tematu"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Widok/_Sortuj/wg _kolorów etykiet"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Widok/_Sortuj/wg _zaznaczeń"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Widok/_Sortuj/wg _nieprzeczytanych"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Widok/_Sortuj/wg z_ałączników"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Widok/_Sortuj/Nie s_ortuj"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Widok/_Sortuj/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Widok/_Sortuj/Rosnąco"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Widok/_Sortuj/Malejąco"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Widok/_Sortuj/_Grupuj wg tematu"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Widok/Widok wą_tków"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Widok/_Rozwiń wszystkie wątki"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Widok/_Zwiń wszystkie wątki"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Widok/Ustaw wyświetlane _elementy..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Widok/_Idź do"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Widok/_Idź do/_Poprzednia wiadomość"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Widok/_Idź do/_Następna wiadomość"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Widok/_Idź do/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Widok/_Idź do/Poprzednia niep_rzeczytana wiadomość"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Widok/_Idź do/Następna ni_eprzeczytana wiadomość"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Widok/_Idź do/_Poprzednia wiadomość"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Widok/_Idź do/_Następna nowa wiadomość"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Widok/_Idź do/Poprzednia zaznaczona wiado_mość"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Widok/_Idź do/Następna z_aznaczona wiadomość"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Widok/_Idź do/_Poprzednia etykietowana wiadomość"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Widok/_Idź do/_Następna etykietowana wiadomość"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Widok/Kodowani_e znaków/_Automatyczne"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-15)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Widok/Kodowani_e znaków/Chińskie (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/W_Widok/Ot_wórz w nowym oknie"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Widok/P_okaż źródło"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/_Widok/Wszystkie na_główki"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Widok/_Odśwież podsumowanie"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Wiadomość"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/Wiado_mość/Odbier_z"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Wiado_mość/Odbier_z/Pobierz z bieżą_cego konta"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Wiado_mość/Odbier_z/Pobierz ze _wszystkich kont"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Wiadomość/Odbier_z/Anuluj pob_ieranie"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/Wiado_mość/Odbier_z/Pobierz ze _wszystkich kont"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/Wiado_mość/Odbier_z/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/Wiado_mość/Wyślij wia_domości z kolejki"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Wiadomość/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/Wiado_mość/Twórz _nową wiadomość"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/Wiado_mość/_Odpowiedz"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/Wiado_mość/Odpowied_z"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Wiado_mość/Odpowied_z/w_szystkim"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Wiado_mość/Odpowied_z/nadawc_y"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Wiado_mość/Odpowiedz/_liście dyskusyjnej"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/Wiado_mość/Przekaż da_lej"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/Wiado_mość/Przekaż j_ako załącznik"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/Wiado_mość/Prze_kieruj"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/Wiado_mość/_Przesuń..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/Wiado_mość/_Kopiuj"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/Wiado_mość/_Zaznacz"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 #, fuzzy
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/Wiado_mość/_Zaznacz/_Zaznacz"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/Wiado_mość/_Zaznacz/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako ni_eprzeczytane"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako przecz_ytane"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Wiado_mość/_Zaznacz/Oznacz wątek jako przecz_ytany"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz wszystkie jako przecz_ytane"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/Wiado_mość/_Usuń"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/Wiado_mość/Oznacz jako _niechcianą"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Wiadomość/Oznacz jako _pożądaną"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/Wiado_mość/Prz_eedytuj"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Narzędzia/Dodaj nadawcę do _książki adresowej"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Automatycznie"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Od"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Do"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Temat"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Narzędzia/_Filtruj niechciane wiadomości w katalogu"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Narzędzia/Filtruj niechciane wśród _zaznaczonych wiadomości"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Wiado_mość/Usuń z_duplikowane wiadomości"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 #, fuzzy
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/Wiado_mość/Usuń z_duplikowane wiadomości"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Narzędzia/_Filtruj niechciane wiadomości w katalogu"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Narzędzia/Okno _logów"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/Konfigura_cja"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Konfigura_cja/Preferen_cje..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 #, fuzzy
 msgid "/_Configuration/_Filter settings..."
 msgstr "/Konfigura_cja/Ustawienia _filtrowania"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/Konfigura_cja/_Szablon..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/Konfigura_cja/Poleceni_a..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 #, fuzzy
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/Konfigura_cja/_Szablon..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/Konfigura_cja/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Konfigura_cja/_Preferencje bieżącego konta..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/Konfigura_cja/Utwórz _nowe konto..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Konfigura_cja/_Edytuj konta..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/Konfigura_cja/Zmień bieżą_ce konto"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Pomoc/_Podręcznik"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoc/_Podręcznik/Angi_elski"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoc/_Podręcznik/_Japoński"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/Pomo_c/_FAQ"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoc/_FAQ/Angi_elskie"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoc/_FAQ/_Niemieckie"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoc/_FAQ/Hi_szpańskie"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoc/_FAQ/_Francuskie"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoc/_FAQ/_Włoskie"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Nie ustawiono polecenia."
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Pomoc/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr ""
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr ""
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Tworzenie głównego okna...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "gotowe.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Bez tytułu"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "żaden"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Jesteś offline. Przejść do trybu online?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3993,16 +4023,16 @@ msgstr ""
 "Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
 "automatycznie skanowana."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4012,101 +4042,101 @@ msgstr ""
 "Być może pliki już istnieją lub brak jest wystarczających uprawnień do "
 "zapisu w tym miejscu."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Widok Katalogów"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Odpowiedz wszystkim"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Odpowiedz nadawcy"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _liście dyskusyjnej"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Ikony i _tekst"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Ikony"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "_Ikony"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 #, fuzzy
 msgid "_Text"
 msgstr "Tekst"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 #, fuzzy
 msgid "_None"
 msgstr "Brak"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Jesteś offline. Kliknij ikonę by przejść do trybu online."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Jesteś online. Kliknij ikonę, by przejść do trybu offline."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Czy zakończyć program?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Wybierz katalog"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 #, fuzzy
 msgid "Command line options"
 msgstr "Nie ustawiono polecenia."
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4125,7 +4155,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4144,15 +4174,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4397,245 +4427,245 @@ msgstr "Plik"
 msgid "Description: "
 msgstr "Opis"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Otwieranie okna preferencji konta...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Preferencje nowego konta"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Preferencje konta"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Tworzenie okna preferencji okna...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Odbieranie"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Utwórz"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Serwer pośredniczący"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Nazwa tego konta"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Ustaw jako domyślne"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Informacje osobiste"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Pełna nazwa"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Adres e-mail"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organizacja"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Informacje o serwerze"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Żaden (lokalnie)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Ten serwer wymaga autoryzacji"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Serwer news"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Serwer dla odbioru"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Serwer SMTP (dla wysyłania)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Hasło"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Użyj bezpiecznej autentykacji (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Usuwanie wiadomości z serwera po odebraniu"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Usuwanie po"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "dniach"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dni: usuwa natychmiast)"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Pobieranie wszystkich wiadomości z serwera"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Ograniczenie wielkości pobierania"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtrowanie wiadomości podczas odbierania"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Domyślny inbox"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nieprzefiltrowane wiadomości zostaną zachowane w tym katalogu)"
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Sposób uwierzytelniania"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Tylko przy ręcznym odbieraniu"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrowanie wiadomości podczas odbierania"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "News"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maksymalna liczba pobieranych artykułów\n"
 "(bez ograniczeń - 0)"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "\"Odbierz wszystkie\" sprawdza pocztę dla tego konta"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Nagłówek"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Dodawanie pola Data do nagłówka"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Generowanie identyrikatora wiadomości"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Dodawanie nagłówka zdefiniowanego przez użytkownika"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr "Edycja..."
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Uwierzytelnianie SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4643,251 +4673,255 @@ msgstr ""
 "Jeśli te pola pozostaną puste, użyty zostanie ten sam login i hasło, co przy "
 "odbieraniu."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Uwierzytelnianie POP3 przed wysyłaniem"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Bezpośrednio wprowadzony"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Nazwa:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Wyjście polecenia"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Wstaw podpis przed cytatem (nie zalecane)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automatyczne ustawianie następujących adresów"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Kopia"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Ukryta kopia"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Adres zwrotny"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Domyślnie podpisywanie wiadomości"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Domyślnie szyfrowanie wiadomości"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Szyfruj odpowiedzi na szyfrowane wiadomości"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Używanie formatu ASCII-armored dla szyfrowania"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Wstawianie podpisu czystym tekstem"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Używanie standardowego klucza GnuPG"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Wybieranie klucz poprzez swój adres e-mail"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Ręczne określanie klucza"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Użytkownik lub klucz ID:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Nie korzystanie z SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Używanie SSL dla połączeń POP3"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Używanie polecenia STARTTLS by rozpocząć sesję SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Używanie SSL dla połączeń IMAP4"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Używanie SSL dla połączeń NNTP"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Wysyłanie (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Używanie SSL dla połączeń SMTP"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Używanie nieblokującego SSL"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Wyłącz to, jeśli masz problemy z połączeniem SSL)"
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "Korzystaj z pośrednika SOCKS"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 #, fuzzy
 msgid "Hostname:"
 msgstr "Nazwa hosta"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 #, fuzzy
 msgid "Port:"
 msgstr "Port"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 #, fuzzy
 msgid "Use authentication"
 msgstr "Uwierzytelnianie"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Nazwa:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 #, fuzzy
 msgid "Password:"
 msgstr "Hasło"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 #, fuzzy
 msgid "Use SOCKS proxy on sending"
 msgstr "Używanie zewnętrznego programu do wysyłania"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Określ port SMTP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Określ port POP3"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Określ port IMAP4"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Określ port NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Określ nazwę domeny"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Katalog serwera IMAP4."
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Zostaną wyświetlone tylko podkatalogi tego folderu."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Pobieranie wszystkich wiadomości z serwera"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Zapisywanie wysłanych wiadomości do"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Zapisywanie szablonów wiadomości do"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Zapisywanie usuniętych wiadomości do"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Zapisywanie usuniętych wiadomości do"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Nie określono nazwy konta."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Nie określono adresu e-mail."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Nie określono serwera SMTP."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Nie określono ID użytkownika."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Nie określono serwera POP3."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Nie określono serwera IMAP4."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Nie określono serwera NNTP."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Dany katalog nie jest katalogiem kolejki."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 03d88f40..d68ccb17 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2015-05-19 11:30-0200\n"
 "Last-Translator: Felipe Braga <fbobraga@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
@@ -38,202 +38,207 @@ msgstr "Filtro de spam (manual)"
 msgid "Junk mail filter"
 msgstr "Filtro de spam"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP4 com %s foi finalizada. Reconectando...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "O servidor IMAP4 desabilita LOGIN.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "Não foi possível estabelecer uma conexão IMAP.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "Criando conexão IMAP4 com %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Não foi possível iniciar sessão TLS.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(recebendo FLAGS...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "Recebendo mensagem %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Adicionando mensagens em %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Movendo mensagens %s para %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensagens %s para %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Excluindo mensagens %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "Não foi possível marcar como excluído: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "Não foi possível eliminar\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Removendo todas as mensagens em %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "Não foi possível marcar como excluído: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "Não foi possível fechar a pasta\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "pasta raiz %s inexistente\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "Houve um erro ao receber resultados do LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Não foi possível criar \"%s\"\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "não foi possível criar \"%s\" sob a Caixa de entrada\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Não foi possível criar caixa de correio: LIST falhou\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "Não foi possível criar caixa de correio\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "Não foi possível criar caixa de correio\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Não é possível renomear caixa de correio: %s para %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "Não foi possível excluir a caixa de correio\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Recebendo cabeçalhos das mensagens (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "Ocorreu um erro ao receber \"envelope\"\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Não foi possível realizar o parse no envelope: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "Não foi possível receber o \"envelope\"\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Não foi possível se conectar ao servidor IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Não foi possível estabelecer uma sessão IMAP4 com: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "Não foi possível receber o namespace\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Não foi possível selecionar a pasta: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "Erro no comando IMAP: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "Falha na autenticação IMAP4.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Falha ao efetuar login no servidor IMAP4.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "não foi possível copiar a mensagem %s para %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(enviando arquivo...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "Não foi possível incluir a mensagem em %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "Não foi possível copiar %s para %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Erro no comando IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Erro no comando IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "Erro no comando IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "O iconv não pode converter UTF-7 para %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "O iconv não pode converter %s para UTF-7\n"
@@ -509,7 +514,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "Erro na sessão POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "falha ao gravar a configuração no arquivo\n"
@@ -561,50 +566,50 @@ msgstr "resposta SMTP inválida\n"
 msgid "error occurred on SMTP session\n"
 msgstr "erro na sessão SMTP\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 não disponível\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 disponível\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 não disponível\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 disponível\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "método SSL não disponível\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Método SSL desconhecido *ERRO DE PROGRAMA*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Erro ao criar o contexto SSL\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Conexão SSL usando %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Certificado do servidor:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Assunto: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "Emissor: %s\n"
@@ -664,7 +669,7 @@ msgstr ""
 "programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple "
 "Place, Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -701,14 +706,14 @@ msgstr ""
 "na coluna \"G\" para habilitar essa caixa no comando \"Receber todas\"."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -836,13 +841,13 @@ msgstr "Argumento de usuário para a ação"
 msgid "Add Address to Book"
 msgstr "Adicionar ao Catálogo de Endereços"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Endereço"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notas"
 
@@ -854,7 +859,7 @@ msgstr "Selecione pasta do Catálogo de Endereços"
 msgid "Auto-registered address"
 msgstr "Endereços registrados automaticamente"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Arquivo"
@@ -875,10 +880,10 @@ msgstr "/_Arquivo/Novo _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arquivo/Novo Servidor _LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
@@ -895,21 +900,21 @@ msgstr "/_Arquivo/E_xcluir"
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
@@ -953,7 +958,7 @@ msgstr "/_Endereço/E_ditar"
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/E_xcluir"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -966,12 +971,12 @@ msgstr "/_Ferramentas/Importar arquivo _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar arquivo _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
@@ -989,7 +994,7 @@ msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1031,7 +1036,7 @@ msgstr "Catálogo de endereços"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Pasta"
 
@@ -1043,17 +1048,17 @@ msgstr "Endereço de e-mail"
 msgid "Search:"
 msgstr "Procurar:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Cco:"
@@ -1264,7 +1269,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1320,393 +1325,398 @@ msgstr "Marrom"
 msgid "None"
 msgstr "Nenhuma"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Abrir"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Adicionar"
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Remover"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/Propr_iedades..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Arquivo/_Enviar"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Arquivo/Enviar _depois"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Arquivo/Salvar como rascunho"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Arquivo/Salvar e _continuar editando"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Arquivo/_Anexar arquivo"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Arquivo/_Inserir arquivo"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Arquivo/Inserir as_sinatura"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Arquivo/Incluir as_sinatura"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfazer"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refazer"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/Re_cortar"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Colar como ci_tação"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/Selecionar _tudo"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Quebrar parágrafo atual"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/Quebrar _linhas longas"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Quebrar linhas automaticamente"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/E_xibir"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/E_xibir/_Para"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/E_xibir/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/E_xibir/_Cco"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/E_xibir/_Reply-To"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/E_xibir/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/E_xibir/_Followup-To"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/E_xibir/_Régua"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/E_xibir/_Anexo"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/E_xibir/Per_sonalizar barra de ferramentas..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação de caracteres"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/E_xibir/Codificação de caracteres/_Automático"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação de caracteres/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/E_xibir/_Codificação de caracteres/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_Codificação de caracteres/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/E_xibir/_Codificação de caracteres/Europeu Ocidental (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/E_xibir/_Codificação de caracteres/Europeu Ocidental (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/E_xibir/_Codificação de caracteres/Europeu Central (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/E_xibir/_Codificação de caracteres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/E_xibir/_Codificação de caracteres/Grego (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/E_xibir/_Codificação de caracteres/Árabe (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/E_xibir/_Codificação de caracteres/Árabe (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/E_xibir/_Codificação de caracteres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Catálogo de endereços"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Ferramentas/Editar com aplicativo e_xterno"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Ferramentas/Solicitar confirmação _de entrega"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Ferramentas/_Assinar com PGP"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Ferramentas/_Criptografar com PGP"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Ferramentas/_Verificar ortografia"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Ferramentas/Definir _idioma do verificador ortográfico"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Não foi possível receber o texto\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de citação."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s não existe\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Não foi possível obter o tamanho de %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) desta mensagem."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Editando%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Assinatura"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Sem assunto"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "O assunto está em branco. Enviar mesmo assim?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Anexo faltante"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Não há anexos. Enviar assim mesmo?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Verificar destinatários"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr ""
 "Você realmente deseja enviar este e-mail para os seguintes destinatários?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "_Enviar"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
@@ -1714,11 +1724,11 @@ msgstr ""
 "A verificação de novas mensagens está sendo efetuada.\n"
 "Por favor tente novamente mais tarde."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "Não foi possível  obter a lista de destinatários."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1726,12 +1736,12 @@ msgstr ""
 "A conta para envio de mensagem não foi especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
@@ -1739,28 +1749,28 @@ msgstr ""
 "Envio da mensagem concluído, mas a mensagem não pôde ser salva na caixa de "
 "saída."
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Não foi possível localizar a chave para \"%s\"."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "Não foi possível assinar a mensagem."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "Não foi possível cripografar a mensagem."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "Não foi possível assinar ou criptografar a mensagem."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1772,11 +1782,11 @@ msgstr ""
 "\n"
 "Enviar como %s mesmo assim?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Erro ao converter a codificação"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1789,15 +1799,15 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Criptografando com Bcc"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1811,94 +1821,104 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "não foi possível remover a mensagem antiga\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "O arquivo %s não existe."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Não foi possível abrir o arquivo %s."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Assinar com PGP"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "Criptografar com PGP"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Tipo de dados"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Assinatura"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Verificando assinatura"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "O arquivo não existe."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Abrindo arquivo executável"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1910,12 +1930,12 @@ msgstr ""
 "Se você deseja executá-lo, salve-o em algum diretório e certifique-se de que "
 "não seja um vírus ou programa malicioso."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, 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:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1924,49 +1944,49 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "_Personalizar a barra de ferramentas..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Esta mensagem foi modificada.  Você deseja salvá-la na pasta de rascunhos?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Você deseja aplicar o modelo \"%s\"?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -2007,7 +2027,7 @@ msgid "Nick Name"
 msgstr "Apelido"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Endereço de e-mail"
 
@@ -2065,7 +2085,7 @@ msgid " Check File "
 msgstr " Verificar Arquivo "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Arquivo"
 
@@ -2073,62 +2093,62 @@ msgstr "Arquivo"
 msgid "Add New Address Book"
 msgstr "Adicionar Novo Catálogo de Endereços"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Um nome de grupo deve ser informado."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Editar Dados do Grupo"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Nome do Grupo"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Endereços Disponíveis"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Endereços no Grupo"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mover endereços de e-mail de/para grupos com as setas dos botões"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Editar Detalhes de Grupo"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Adicionar Novo Grupo"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Editar pasta"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -2145,7 +2165,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2210,7 +2230,7 @@ msgstr "Tempo limite (segundos)"
 msgid "Maximum Entries"
 msgstr "Número máximo de registros"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Básicas"
 
@@ -2298,7 +2318,7 @@ msgid "MH (number only)"
 msgstr "MH (somente número)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Selecionar..."
 
@@ -2479,12 +2499,12 @@ msgstr "Configurando informações da pasta...\n"
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
@@ -3318,682 +3338,692 @@ msgstr ""
 "Configurações de uma versão antiga do Sylpheed foram encontradas.\n"
 "Você deseja convertê-las para a versão atual?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Arquivo/P_asta"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "_Arquivo/_Pasta/Criar _nova pasta ..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Arquivo/_Pasta/_Renomear pasta..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Arquivo/_Pasta/_Mover pasta..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Arquivo/_Pasta/E_xcluir pasta"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Arquivo/_Caixa de correio"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Arquivo/_Caixa de correio/_Adicionar caixa de correio..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Arquivo/_Caixa de correio/Excluir _caixa de correio"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Arquivo/_Caixa de correio/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Arquivo/_Caixa de correio/_Procurar por mensagens novas"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Arquivo/Procurar por mensagens novas em _todas as caixas de correio"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Arquivo/_Caixa de correio/_Reconstruir árvore de pastas"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_Arquivo/I_mportar dados..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_Arquivo/_Exportar dados..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Arquivo/Esvaziar _lixeira"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Arquivo/_Salvar como..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Arquivo/Confi_gurar Página..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Arquivo/Im_primir"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Arquivo/_Trabalhar desconectado"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Arquivo/Sai_r"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/_Selecionar conversa"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editar/_Procurar na mensagem atual..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Editar/Procurar _mensagens..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/_Editar/Busca _rápida"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/E_xibir/E_xibir ou ocultar"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/E_xibir/E_xibir ou ocultar/_Árvore de pastas"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/E_xibir/E_xibir ou ocultar/Ver _Mensagens"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/E_xibir/E_xibir ou ocultar/_Barra de Ferramentas"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/E_xibir/E_xibir ou ocultar/_Barra de Ferramentas/Ícones _e texto"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/E_xibir/E_xibir ou ocultar/Texto à _direita do ícone"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/E_xibir/E_xibir ou ocultar/_Barra de Ferramentas/Í_cones"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/E_xibir/E_xibir ou ocultar/_Barra de Ferramentas/_Texto"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/E_xibir/E_xibir ou ocultar/_Barra de Ferramentas/_Nenhum"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/E_xibir/E_xibir ou ocultar/Barra de bu_sca"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/E_xibir/E_xibir ou ocultar/Barra de _estado"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/E_xibir/Personali_zar barra de ferramentas..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/E_xibir/_Layout"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/E_xibir/_Layout/_Normal"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/E_xibir/_Layout/_Vertical"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/E_xibir/Á_rvore de pastas separadas"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/E_xibir/Visualização separada da _mensagem"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/E_xibir/Class_ificar"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/E_xibir/Class_ificar/por _número"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/E_xibir/Class_ificar/por _tamanho"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/E_xibir/Class_ificar/por _data"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/E_xibir/Class_ificar/por _data da discussão"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/E_xibir/Class_ificar/por _remetente"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/E_xibir/Class_ificar/por _destinatário"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/E_xibir/Class_ificar/por as_sunto"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/E_xibir/Class_ificar/por eti_queta"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/E_xibir/Class_ificar/por _marca"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/E_xibir/Class_ificar/por _não lidas"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/E_xibir/Class_ificar/por _anexos"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/E_xibir/Class_ificar/_Não ordenar"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/E_xibir/Class_ificar/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/E_xibir/Class_ificar/Crescente"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/E_xibir/Class_ificar/Decrescente"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/E_xibir/Class_ificar/Agrupar _por assunto"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/E_xibir/Exibir conver_sas"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/E_xibir/E_xpandir todas as conversas"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/E_xibir/Fech_ar todas as conversas"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/E_xibir/Colunas _visíveis..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/E_xibir/Ir _para"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/E_xibir/Ir _Para/Mensagem a_nterior"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/E_xibir/Ir _Para/_Próxima mensagem"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/E_xibir/Ir _Para/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/E_xibir/Ir _Para/Anterior não _lida"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/E_xibir/Ir _Para/Próxima não l_ida"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/E_xibir/Ir _Para/Mensagem n_ova anterior"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem _nova"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/E_xibir/Ir _Para/Mensagem marcada a_nterior"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem ma_rcada"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/E_xibir/Ir _Para/Mensagem e_tiquetada anterior"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem etique_tada"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/E_xibir/Ir _Para/Outra _pasta..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/E_xibir/_Codificação de caracteres/_Detectar automaticamente"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/E_xibir/_Codificação de caracteres/Europeu Ocidental (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma n_ova janela"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Ver _fonte"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/E_xibir/_Todos os cabeçalhos"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/E_xibir/At_ualizar sumário"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Mensagem"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensagem/Rece_ber"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensagem/Rece_ber/Receber da conta _atual"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensagem/Rece_ber/Receber de _todas as contas"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Mensagem/Rece_ber/_Parar recebimento"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Mensagem/Rece_ber/_Caixa de mensagens remota..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensagem/Rece_ber/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensagem/Enviar mensagens da caixa de _saída"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensagem/Escrever _nova mensagem"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/_Responder"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/Responder _para"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Mensagem/Responder _para/_todos"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder _para/_remetente"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Mensagem/Responder _para/_lista"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encam_inhar"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensagem/Re_direcionar"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Mensagem/Mo_ver..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Mensagem/_Copiar..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Mensagem/_Marcar"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Mensagem/_Marcar/_Marcar"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Mensagem/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensagem/_Marcar/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensagem/_Marcar/Marcar como _não lida"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensagem/_Marcar/Marcar como l_ida"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Mensagem/_Marcar/Marcar _conversa como lida"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensagem/_Marcar/Marcar _todas como lidas"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Mensagem/E_xcluir"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensagem/Classificar como _spam"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensagem/C_lassificar como não-spam"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensagem/_Editar novamente"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Ferramentas/Adicionar remetente ao catálogo de _endereços"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/Filtrar _todas as mensagens na pasta"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar mensagens selecionadas"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/Criar regra de filtro"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/Criar regra de _filtro/_Automaticamente"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/Criar regra de _filtro/Pelo _remetente"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/Criar regra de _filtro/Pelo _destinatário"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/Criar regra de _filtro/Pelo a_ssunto"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Ferramentas/Filtrar spam nesta _pasta"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Ferramentas/Filtrar spam nas _mensagens selecionadas"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/_Excluir mensagens duplicadas"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Ferramentas/C_oncatenar mensagens separadas"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Ferramentas/_Processar mensagens marcadas"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Ferramentas/Filtrar spam nesta _pasta"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Ferramentas/Filtrar _todas as mensagens na pasta"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Janela de log"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Configuração"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuração/_Preferências comuns..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Configuração/_Filtros..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuração/_Modelo..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuração/_Ações..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Configuração/_Gerenciador de plug-ins..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Configuração/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuração/Preferências para a con_ta atual..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuração/Criar uma _nova conta..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuração/_Editar contas..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuração/Mudar _conta atual"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/A_juda/_Manual"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/A_juda/_Manual/_Inglês"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_juda/_Manual/_Japonês"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/A_juda/_FAQ"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_juda/_FAQ/_Inglês"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_juda/_FAQ/_Alemão"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_juda/_FAQ/_Espanhol"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_juda/_FAQ/_Francês"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_juda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/A_juda/Opções de linha de comando"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/A_juda/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/A_juda/Verificar por _atualizações..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/A_juda/Verificar por _atualizações dos plugins..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Criando janela principal...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "Pronto.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Sem título"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Você está desconectado. Conectar?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Esvaziar lixeira"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Excluir todas as mensagens nas lixeiras?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -4003,16 +4033,16 @@ msgstr ""
 "Se uma caixa de correio existente for especificada, ela será\n"
 "analisada automaticamente."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio \"%s\" já existe."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4022,95 +4052,95 @@ msgstr ""
 "Talvez alguns arquivos já existam, ou você não tem permissão de escrita para "
 "o caminho indicado."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Visão de Pastas"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Responder para _todos"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Responder para o _remetente"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Responder para a _lista"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/Encami_nhar"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Encamin_har como anexo"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Ícone _e texto"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Texto à _direita do ícone"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "Í_cone"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_Texto"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_Nenhuma"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Você deseja sair deste programa?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "As mensagens selecionadas não podem ser combinadas"
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Selecione uma pasta para abrir"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Opções de linha de comando"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPÇÃO]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4144,7 +4174,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4178,15 +4208,15 @@ msgstr ""
 "exibe esta ajuda e sai\n"
 "exibe informação de versão e sai"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Opção para Windows apenas:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "Indique a porta para comandos IPC remotos"
 
@@ -4419,236 +4449,236 @@ msgstr "Arquivo: "
 msgid "Description: "
 msgstr "Descrição: "
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Abrindo janela de preferências da conta...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Conta%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Preferências para a nova conta"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Preferências da conta"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Criando janela de preferências da conta...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Receber"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Enviar"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Escrever"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Avançadas"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Nome desta conta"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Marcar como padrão"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Informações pessoais"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Nome completo"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organização"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Informações do servidor"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Notícias (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Nenhuma (local)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Este servidor requer autenticação"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Servidor de notícias"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Servidor de recepção"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (envio)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Usuário"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Senha"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autenticação segura (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Excluir mensagens recebidas do servidor"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Excluir depois de"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "dias"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 dias: exclui imediatamente"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Receber todas as mensagens (incluindo as já recebidas) no servidor"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Limite de tamanho de recebimento"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Caixa de Entrada Padrão"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Mensagens não filtradas serão guardadas nesta pasta."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Método de Autenticação"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Verificar apenas a Caixa de Entrada ao receber"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrar novas mensagens na Caixa de Entrada ao receber"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Notícias"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artigos para receber"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Sem limite se 0 for especificado."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "\"Receber todas\" verifica novas mensagens nesta conta"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabeçalho"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Adicionar campo de data"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalhos personalizados"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Editar... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4656,240 +4686,244 @@ msgstr ""
 "Se você deixar essas opções em branco, o nome de usuário e a senha de "
 "recebimento serão usados."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticar com POP3 antes de enviar"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Assinatura"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Digitar diretamente"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Nome:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Saída de comando"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Colocar assinatura antes da citação (não recomendado)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Definir os seguintes endereços automaticamente"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Responder"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "Assinar mensagens com PGP por padrão"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "Criptografar mensagens com PGP por padrão"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Criptografar ao responder a uma mensagem criptografada"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 msgid "Add my own key to the recipients list on encryption"
 msgstr "Adicionar minha chave para a lista de destinatários ao criptografar."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Usar formato ASCII-armored para criptografia"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Inserir assinatura de texto puro"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr "Chave de Assinatura / Criptografia"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Usar a chave GnuPG padrão"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Selecionar a chave de acordo com seu endereço de e-mail"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Indicar uma chave manualmente"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Nome de usuário ou ID da chave:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Não usar SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para conexão POP3"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar comando STARTTLS para iniciar a sessão SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para conexão IMAP4"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para conexão NNTP"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para conexão SMTP"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Usar SSL não-bloqueante"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Desabilite isto se você tiver problemas na conexão SSL"
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "Usar proxy SOCKS"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Endereço do servidor:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Usar autenticação"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Nome:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Usar proxy SOCKS ao enviar"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Indicar a porta SMTP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Indicar a porta POP3"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Indicar a porta IMAP4"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Indicar a porta NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Indicar o nome do domínio"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Servidor de diretório IMAP"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Apenas as subpastas deste diretório serão exibidas."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Limpar todos os caches de mensagens ao sair"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Colocar mensagens enviadas em"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Colocar mensagens de rascunho em"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Colocar mensagens a serem enviadas em"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Colocar mensagens excluídas em"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Nome da conta não definido."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Endereço de e-mail não especificado."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Servidor SMTP não especificado."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Usuário não especificado."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Servidor POP3 não especificado."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Servidor IMAP4 não especificado."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Servidor NNTP não especificado."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "A pasta especificada não é do tipo \"Caixa de Saída\"."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/ro.po b/po/ro.po
index f5313bab..588c39cb 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2011-12-13 17:35+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: Gnome Romanian Team <gnomero-list@lists.sourceforge.net>\n"
@@ -29,210 +29,215 @@ msgstr "Filtru de spam (manual)"
 msgid "Junk mail filter"
 msgstr "Filtru de spam"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Conexiunea IMAP4 la %s a fost întreruptă. Se reconectează...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Serverul IMAP4 dezactivează LOGIN.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "Nu s-a putut stabili conexiunea IMAP.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "se creează conexiunea IMAP4 la %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Nu se poate porni sesiunea TLS.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(se recepționează FLAGS...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "Obținere mesaj %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Adăugare mesaje la %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Se mută mesajele %s la %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Se copiază mesajele %s la %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Ștergere mesaje %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nu se pot seta fanioanele de ștergere: %s\n"
 
 # hm ?
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "nu se poate elimina\n"
 
 # hm ? din sau în ?
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Ștergere mesaje din %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nu se pot seta fanioanele de ștergere: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "nu se poate închide dosarul\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "dosarul root %s nu există\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "a apărut o eroare în timpul obțineriii „LIST”.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nu se poate crea „%s”\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nu se poate crea „%s” în INBOX\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nu se poate crea căsuța poștală: LIST a eșuat.\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "nu se poate crea căsuța poștală\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "nu se poate crea căsuța poștală\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nu se poate redenumi căsuța poștală: %s în %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "nu se poate șterge căsuța poștală\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Obținere anteturi mesaje (%d / %d)"
 
 # hm ? envelope conform wikipedia
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr ""
 "a apărut o eroare în timpul obținerii „envelope” (informația de routing).\n"
 
 # hm ? envelope conform wikipedia
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "„envelope” (informația de routing) nu poate fi analizată: %s\n"
 
 # hm ? envelope conform wikipedia
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "nu se poate obține „envelope” (informația de routing)\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nu se poate efectua conexiunea la serverul IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nu se poate stabili sesiunea IMAP4 cu: %s:%d\n"
 
 # hm ?
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "nu se poate obține spațiul de nume\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nu se poate selecta dosarul: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "eroare la comanda IMAP: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentificarea IMAP4 a eșuat.\n"
 
 # hm ? cu ce diferă de authentication ?
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificarea IMAP4 a eșuat.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nu se poate adăuga %s la %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(se trimite fișierul...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nu se poate adăuga mesajul la %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nu se poate copia %s la %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "eroare în timpul comenzii IMAP: STORE:%s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "eroare în timpul comenzii IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "eroare în timpul comenzii IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nu poate efectua conversia UTF-7 la %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nu poate efectua conversia %s la UTF-7\n"
@@ -508,7 +513,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "a apărut o eroare la sesiunea POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "scrierea configurație în fișier a eșuat\n"
@@ -560,50 +565,50 @@ msgstr "răspuns SMTP incorect\n"
 msgid "error occurred on SMTP session\n"
 msgstr "a apărut o eroare la sesiunea SMTP\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 indisponibil\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 disponibil\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 indisponibil\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 disponibil\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "Metodă SSL indisponibilă\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Metodă SSL necunoscută *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Eroare la crearea contextului SSL\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Conexiune SSL folosind %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Server de certificate:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Subiect: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Emitent: %s\n"
@@ -663,7 +668,7 @@ msgstr ""
 "acest program; dacă nu, scrieți la Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -702,14 +707,14 @@ msgstr ""
 "pentru a activa recepționarea mesajelor la comanda „Verifică tot”."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Nume"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -846,13 +851,13 @@ msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
 # în meniu la compunere
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Agendă"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Observații"
 
@@ -864,7 +869,7 @@ msgstr "Selectați dosarul pentru agendă"
 msgid "Auto-registered address"
 msgstr "Adrese înregistrate automat"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Fișier"
@@ -885,10 +890,10 @@ msgstr "/_Fișier/_JPilot nou"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fișier/Server _LDAP nou"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Fișier/---"
@@ -905,22 +910,22 @@ msgstr "/_Fișier/Ș_terge"
 msgid "/_File/_Save"
 msgstr "/_Fișier/_Salvează"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Fișier/În_chide"
 
 # comun și în main menu și în rmb agendă
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Editare"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiază"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Editare/Li_pește"
 
@@ -967,7 +972,7 @@ msgstr "/A_dresă/_Editează"
 msgid "/_Address/_Delete"
 msgstr "/A_dresă/Ș_terge"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Unelte"
@@ -980,12 +985,12 @@ msgstr "/_Unelte/Importă un fișier _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Unelte/Importă un fișier _CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Ajutor/_Despre"
@@ -1003,7 +1008,7 @@ msgid "/New _Folder"
 msgstr "/_Dosar nou"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1047,7 +1052,7 @@ msgstr "Agendă"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Dosar"
 
@@ -1059,17 +1064,17 @@ msgstr "Adresă de e-mail"
 msgid "Search:"
 msgstr "Caută:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Către:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1278,7 +1283,7 @@ msgstr "Adrese comune"
 msgid "Personal address"
 msgstr "Adrese personale"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Notificare"
 
@@ -1334,398 +1339,403 @@ msgstr "Maro"
 msgid "None"
 msgstr "Niciunul"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Deschide"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Adăugă..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/Ște_rge"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Proprietăți..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Fișier/_Trimite"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Fișier/Trimite _mai târziu"
 
 # !!! dependent de traducerea lui draft !!!
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Fișier/Salvează în dosarul _ciorne"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Fișier/_Salvează și continuă editarea"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Fișier/_Atașează un fișier"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Fișier/_Inserează un fișier"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fișier/Inserea_ză semnătura"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Fișier/Adau_gă semnătura"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Editare/An_ulează"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Editare/_Refă"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Editare/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Editare/_Taie"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editare/_Lipește ca citat"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Editare/Selecte_ază tot"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editare/_Desparte paragraful curent"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editare/Desparte _liniile lungi"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editare/Desparte liniile aut_omat"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Vizualizare"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Vizualizare/Că_tre"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Vizualizare/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Vizualizare/_Bcc"
 
 # obs: câmpul propriu de întoarcere când se răspunde cuiva
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/_Vizualizare/_Răspuns către"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Vizualizare/---"
 
 # hm ?
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/_Vizualizare/_Urmărește"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Vizualizare/Ri_glă"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Vizualizare/_Atașament"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vizualizare/Personali_zează bara de unelte..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Vizualizare/Codare de caract_ere"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Vizualizare/Codare de caract_ere/_Automat"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vizualizare/Codare de caract_ere/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vizualizare/Codare de caract_ere/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vizualizare/Codare de caract_ere/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vizualizare/Codare de caract_ere/Western European (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vizualizare/Codare de caract_ere/Western European (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vizualizare/Codare de caract_ere/Central European (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vizualizare/Codare de caract_ere/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vizualizare/Codare de caract_ere/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vizualizare/Codare de caract_ere/Baltic (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vizualizare/Codare de caract_ere/Greek (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vizualizare/Codare de caract_ere/Arabic (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vizualizare/Codare de caract_ere/Arabic (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vizualizare/Codare de caract_ere/Hebrew (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vizualizare/Codare de caract_ere/Hebrew (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vizualizare/Codare de caract_ere/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vizualizare/Codare de caract_ere/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vizualizare/Codare de caract_ere/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vizualizare/Codare de caract_ere/Cyrillic (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vizualizare/Codare de caract_ere/Cyrillic (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vizualizare/Codare de caract_ere/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vizualizare/Codare de caract_ere/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vizualizare/Codare de caract_ere/Simplified Chinses (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vizualizare/Codare de caract_ere/Traditional Chinese (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vizualizare/Codare de caract_ere/Korean (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vizualizare/Codare de caract_ere/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vizualizare/Codare de caract_ere/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Unelte/_Agendă"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Unelte/_Șablon"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Unelte/Acțiu_ni"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Unelte/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Unelte/Editează cu un editor e_xtern"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Unelte/Cere notificare de _disponibilitate"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Unelte/Semnează P_GP"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Unelte/Cr_iptează PGP"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Unelte/Verifi_că ortografia"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Unelte/_Selectați limba ortografiei"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: fișier inexistent\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Nu se poate obține partea de text\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Eroare de formatare a citației."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Eroare de format al mesajului de răspuns sau înaintat."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Fișierul %s nu există\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nu se poate obține dimensiunea fișierului %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Fișierul %s este gol."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Nu se poate citi %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obține o parte a mesajului multiparte."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compune%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Semnătură"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu este specificat."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Subiect gol"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Subiectul este gol. Trimiteți mesajul oricum ?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Lipsă atașament"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Nu este atașat niciun fișier. Trimiteți fără atașamente ?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Confirmare destinatari"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Sigur trimiteți acest mesaj către următoarele adrese ?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Subiect:"
 
 # butonul de la confirmarea cui se trimite
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "_Trimite"
 
 # nu este clar unde apare
 # (IMAP ?)
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
@@ -1733,11 +1743,11 @@ msgid ""
 msgstr "Se verifică pentru mesaje noi în toate dosarele..."
 
 # hm ?
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "nu se poate obține lista destinatarilor."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1745,13 +1755,13 @@ msgstr ""
 "Contul pentru trimitere de mesaje nu este specificat.\n"
 "Vă rugăm să selectați un cont înainte de a trimite."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A apărut o eroare în timpul trimiterii mesajului către %s ."
 
 # !!! dependent de traducerea lui Outbox !!!
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
@@ -1759,28 +1769,28 @@ msgstr ""
 "Trimiterea mesajului s-a terminat, dar mesajul nu a putut fi salvat în "
 "dosarul „Trimise”."
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nu s-a putut găsi nicio cheie asociată cu ID-ul cheii selectate „%s”."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "Nu se poate semna mesajul."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "Nu se poate cripta mesajul."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "Nu se poate cripta sau semna mesajul."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "nu se pot schimba permisiunile fișierului\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1792,11 +1802,11 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ca %s ?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Eroare conversie cod"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1809,15 +1819,15 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Limită lungime linie"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Criptare cu Bcc"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1831,94 +1841,104 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "nu se poate șterge mesajul vechi\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "se pune mesajul în coada de așteptare...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "nu se poate găsi dosarul de coadă\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "nu se poate pune mesajului în coada de așteptare\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Fișierul %s nu există."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Nu se poate deschide fișierul %s."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Se creează fereastra de compunere...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Semnătură PGP"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Tip de date"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Semnătură"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Verificare semnătură"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Tipul MIME nu este valid."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Fișierul nu există sau este gol."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Nume fișier"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "Fișierul nu există."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Deschidere fișier executabil"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1930,12 +1950,12 @@ msgstr ""
 "Dacă vreți să îl lansați în execuție, salvați-l undeva și asigurați-vă că nu "
 "este un virus sau un alt tip de program malițios."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă pentru editor extern nu este validă: „%s”\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1944,49 +1964,49 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "_Personalizează bara de unelte..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de așteptare."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Selectați fișierele"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Selectați fișierul"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Salvare mesaj"
 
 # !!! dependent de traducerea lui draft !!!
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Acest mesaj a fost modificat. Îl salvați în dosarul Ciorne ?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Închide _fără a salva"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vreți să aplicați șablonul „%s” ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Aplică un șablon"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "Înl_ocuiește"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -2030,7 +2050,7 @@ msgid "Nick Name"
 msgstr "Pseudonim"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Adresă de e-mail"
 
@@ -2089,7 +2109,7 @@ msgid " Check File "
 msgstr " Verifică fișierul "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Fișier"
 
@@ -2098,66 +2118,66 @@ msgid "Add New Address Book"
 msgstr "Adaugă o agendă nouă"
 
 # hm ? sau specificat ?
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Trebuie furnizat un nume de grup."
 
 # hm ? titlu ?
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Editare date grup"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Nume grup"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Adrese disponibile"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Adrese în grup"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Mută adresele de e-mail din sau în grup cu ajutorul butoanelor săgeți"
 
 # hm ? titlu ?
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Editare detalii grup"
 
 # hm ? titlu ?
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Adăugare grup nou"
 
 # hm ? titlu ?
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Editare dosar"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Introduceți noul nume al dosarului:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Dosar nou"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Introduceți numele dosarului nou:"
 
@@ -2174,7 +2194,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editare înregistrare JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2240,7 +2260,7 @@ msgstr "Expirare de timp (secunde)"
 msgid "Maximum Entries"
 msgstr "Număr maxim de înregistrări"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "De bază"
 
@@ -2328,7 +2348,7 @@ msgid "MH (number only)"
 msgstr "MH (doar număr)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Selectează... "
 
@@ -2514,12 +2534,12 @@ msgstr "Se stabilesc informațiile dosarului...\n"
 msgid "Setting folder info..."
 msgstr "Se stabilesc informațiile dosarului..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Se scanează dosarul %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Se scanează dosarul %s ..."
@@ -3370,691 +3390,701 @@ msgstr ""
 "S-a găsit versiunea anterioară de configurare.\n"
 "Vreți să o migrați ?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Fișier/_Dosar"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fișier/_Dosar/Creează un dosar _nou..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fișier/_Dosar/_Redenumește dosarul..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fișier/_Dosar/_Mută dosarul..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fișier/_Dosar/Șter_ge dosarul"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Fișier/_Căsuță poștală"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fișier/_Căsuță poștală/_Adaugă o căsuță poștală..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fișier/_Căsuță poștală/Ște_rge căsuța poștală"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fișier/_Căsuță poștală/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fișier/_Căsuță poștală/Verifi_că pentru mesaje noi"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/_Fișier/_Căsuță poștală/Verifică pentru mesaje noi în to_ate căsuțele "
 "poștale"
 
 # hm ? sau la singular ?
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fișier/_Căsuță poștală/R_econstruiește arborele de dosare"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_Fișier/_Importă date de corespondență..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_Fișier/_Exportă date de corespondență..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Fișier/_Golește tot gunoiul"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Fișier/_Salvează ca..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Fișier/_Aranjare în pagină..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Fișier/Ti_părește..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Fișier/_Lucrează offline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Fișier/Ieși_re"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Editare/Selectează firul de _discuție"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editare/Caută în mesajul c_urent..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Editare/Caută în me_saje..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/_Editare/Căutare _rapidă"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Vizualizare/Arată sau as_cunde"
 
 # hm ? sau la singular ?
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vizualizare/Arată sau ascun_de/Arbore de _dosare"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vizualizare/Arată sau ascun_de/Vizualizare _mesaje"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/Pictogr_ame și text"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr ""
 "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/Text la d_reapta "
 "pictogramelor"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/P_ictograme"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/_Text"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/_Nimic"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de _căutare"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de _stare"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Vizualizare/Personali_zează bara de unelte..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/_Vizualizare/Aran_jament"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Vizualizare/Aran_jament/_Normal"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/_Vizualizare/Aran_jament/_Vertical"
 
 # hm ? sau la singular ?
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vizualizare/Separă fereastra arb_orelui de dosare"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Vizualizare/Separă fereastra de previzualizare a _mesajelor"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Vizualizare/_Sortează"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vizualizare/_Sortează/după _număr"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vizualizare/_Sortează/după d_imensiune"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vizualizare/_Sortează/după _dată"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Vizualizare/_Sortează/după dată _fir de discuție"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vizualizare/_Sortează/după e_xpeditor"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vizualizare/_Sortează/după destinata_r"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vizualizare/_Sortează/după _subiect"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vizualizare/_Sortează/după eticheta de _culoare"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vizualizare/_Sortează/după _marcaj"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vizualizare/_Sortează/d_upă necitit"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vizualizare/_Sortează/după a_tașament"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vizualizare/_Sortează/Nes_ortat"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Vizualizare/_Sortează/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Vizualizare/_Sortează/Ascendent"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Vizualizare/_Sortează/Descendent"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vizualizare/_Sortează/_Atrage după subiect"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Vizualizare/Vizualizează ca fi_r de discuții"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Vizualizare/_Desfășoară firul discuțiilor"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vizualizare/_Pliază firul discuțiilor"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Vizualizare/Alege elementele af_ișate ale sumarului..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Vizualizare/Du-_te la"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vizualizare/Du-_te la/mesajul _precedent"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vizualizare/Du-_te la/mesajul _următor"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Vizualizare/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Vizualizare/Du-_te la/mesajul necitit p_recedent"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vizualizare/Du-_te la/mesajul necitit urmă_tor"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vizualizare/Du-_te la/mesajul nou pre_cedent"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vizualizare/Du-_te la/mesajul nou următ_or"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vizualizare/Du-_te la/mesajul _marcat precedent"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vizualizare/Du-_te la/mesajul m_arcat următor"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vizualizare/Du-_te la/mesajul _etichetat precedent"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vizualizare/Du-_te la/mesajul et_ichetat următor"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vizualizare/Du-_te la/alt _director..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vizualizare/Codare de caract_ere/Detectare _automată"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vizualizare/Codare de caract_ere/Western European (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vizualizare/Codare de caract_ere/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vizualizare/Codare de caract_ere/Japanese (EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vizualizare/Codare de caract_ere/Japanese (Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vizualizare/Codare de caract_ere/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vizualizare/Codare de caract_ere/Chinese (ISO-2022-CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vizualizare/Codare de caract_ere/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Vizualizare/Deschide în fereastră _nouă"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Vizualizare/S_ursă mesaj"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/_Vizualizare/Toate _anteturile"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Vizualizare/Actua_lizează sumarul mesajelor"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Mesaj"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_Mesaj/_Primire"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mesaj/_Primire/Verifică pentru contul _curent"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mesaj/_Primire/Verifică pentru _toate conturile"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Mesaj/_Primire/_Oprește primirea"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Mesaj/_Primire/Căsuță poștală la _distanță"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mesaj/_Primire/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mesaj/Trimite mesajele de la coa_dă"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Mesaj/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Mesaj/Compune un mesaj _nou"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Mesaj/_Răspunde"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Mesaj/Răsp_uns"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mesaj/Răsp_uns/Răspunde _tuturor"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mesaj/Răsp_uns/Răspunde _expeditorului"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mesaj/Răsp_uns/Răspunde _listei de discuții"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Mesaj/Îna_intează"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mesaj/Înaintează ca _atașament"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Mesaj/Redirecționea_ză"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Mesaj/Mu_tă..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Mesaj/_Copiază..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Mesaj/_Marcare"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Mesaj/_Marcare/_Ridică fanionul"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Mesaj/_Marcare/_Coboară fanionul"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Mesaj/_Marcare/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mesaj/_Marcare/Marchează ca _necitit"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mesaj/_Marcare/Marchează ca _citit"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Mesaj/_Marcare/Marchează _firul de discuție ca citit"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mesaj/_Marcare/Marchează _totul ca citit"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Mesaj/Șter_ge"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mesaj/Marchează ca _spam"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mesaj/Marchează ca _util"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Mesaj/Re_editează"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Unelte/A_daugă expeditorul în agendă..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Unelte/_Filtrează toate mesajele în dosar"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Unelte/Filtrează mesajele _selectate"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Unelte/_Creează o regulă de filtrare"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Unelte/_Creează o regulă de filtrare/_automat"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Unelte/_Creează o regulă de filtrare/pe baza câmpului _De la"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Unelte/_Creează o regulă de filtrare/pe baza câmpului _Către"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Unelte/_Creează o regulă de filtrare/pe baza câmpului _Subiect"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Unelte/Filtrează mesa_jele spam în dosar"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Unelte/Filtrează _mesajele spam în mesajele selectate"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Unelte/Șterge mesajele du_plicate"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Unelte/C_oncatenează mesajele separate"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Unelte/E_xecută procesele marcate"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Unelte/Filtrează mesa_jele spam în dosar"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Unelte/_Filtrează toate mesajele în dosar"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Unelte/Fereastră _log"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Configurație"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configurație/Preferințe _comune..."
 
 # hm ? mai scurt pare mai bine și este suficient de intuitiv și-așa datorită trei puncte
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Configurație/_Filtre..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Configurație/Șa_bloane..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configurație/_Acțiuni..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Configurație/_Gestionare plugin-uri..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Configurație/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configurație/_Preferințe pentru contul curent..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configurație/Creează un cont _nou..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configurație/_Editare conturi..."
 
 # hm ? parcă este mai bine decât schimbă contul curent
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configurație/_Selectează contul curent"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Ajutor/_Manual"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajutor/_Manual/_Japoneză"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Ajutor/_FAQ"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajutor/_FAQ/_Engleză"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajutor/_FAQ/_Germană"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajutor/_FAQ/_Spaniolă"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ajutor/_FAQ/_Franceză"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajutor/_FAQ/_Italiană"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Ajutor/Opțiuni în linie de _comandă"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Ajutor/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/_Ajutor/Ca_ută actualizări..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/_Ajutor/Caută actualizări pentru _plugin-uri..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Se creează fereastra principală...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eșuat\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "gata.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Neintitulat"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "nimic"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Sunteți offline. Treceți online ?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Golire gunoi"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Ștergeți toate mesajele din dosarele de gunoi ?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Adaugă căsuță poștală"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -4064,16 +4094,16 @@ msgstr ""
 "Dacă este specificată căsuța poștală existentă,\n"
 "aceasta va fi scanată automat."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Căsuța poștală „%s” există deja."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Căsuță poștală"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4082,95 +4112,95 @@ msgstr ""
 "Crearea căsuței poștale a eșuat.\n"
 "Poate că unele fișiere există deja, sau acolo nu aveți permisiuni de scriere."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vizualizare dosar"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vizualizare mesaj"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Răspunde _tuturor"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Răspunde _expeditorului"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _listei de discuții"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/Îna_intează"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Înaintează ca _atașament"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Redirecționea_ză"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Pictogr_ame și text"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Text la d_reapta pictogramelor"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "P_ictograme"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_Text"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_Nimic"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Sunteți offline. Clic pe pictogramă pentru a trece online."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Sunteți online. Clic pe pictogramă pentru a trece offline."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Ieșire"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Ieșiți din acest program ?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "Mesajele selectate nu au putut fi combinate."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Selectați dosarul de deschis"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Opțiuni de line de comandă"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilizare: sylpheed [OPȚIUNE]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4203,7 +4233,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4236,15 +4266,15 @@ msgstr ""
 "afișează acest ajutor și ieși\n"
 "afișează versiunea și ieși"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Opțiune doar pentru Windows:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "specifică portul pentru comenzi la distanță IPC"
 
@@ -4481,242 +4511,242 @@ msgstr "Fișier: "
 msgid "Description: "
 msgstr "Descriere: "
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Se deschide fereastra de preferințe cont...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Cont%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Preferințe pentru contul nou"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Preferințe cont"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Se creează fereastra de preferințe cont...\n"
 
 # obs: tab-ul din common preferences și edit accounts
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Primire"
 
 # comun și pentru butonul de pe toolbar și pentru tabul din common preferences și edit accounts
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Trimite"
 
 # comun și pentru butonul de pe toolbar și pentru tabul din common preferences și edit accounts
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Compune"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Confidențialitate"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Avansat"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Numele acestui cont"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Stabilește ca implicit"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Informații personale"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Nume complet"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Adresă de e-mail"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organizație"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Informații despre server"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Știri (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Nimic (local)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Acest server necesită autentificare"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Server de știri"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Server pentru primire"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Server SMTP (trimitere)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "ID utilizator"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Parolă"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Folosește autentificarea securizată (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Șterge mesajele de pe server la primire"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Șterge după"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "zile"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 zile: șterge imediat"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Descarcă toate mesajele de pe server (inclusiv cele deja primite)"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Limită dimensiune pentru primire"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KiB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtrează mesajele la primire"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Inbox-ul implicit"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Mesajele nefiltrate vor fi stocate în acest dosar."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Metodă de autentificare"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automat"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "La primire verifică doar INBOX"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "La primire filtrează mesajele noi în INBOX"
 
 # hm ? titlu de chenar; ar trebui să includă partea cu NNTP pentru consecvență cu POP3 și IMAP
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Număr maxim de articole pentru descărcare"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Fără limită dacă este specificat 0."
 
 # !!! dependent de traducerea butonului Get all !!!
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 "„Verifică tot” verifică pentru eventuale mesaje noi (și) pentru acest cont"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Antet"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Adaugă câmpul „Date” la antet"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Generează câmpul „Message-ID”"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Adaugă un antet definit de utilizator"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Editare... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificare SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4724,245 +4754,249 @@ msgstr ""
 "Dacă lăsați goale aceste intrări, se va utiliza același nume utilizator și "
 "aceeași parolă ca și pentru primire."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentifică cu POP3 înainte de a trimite"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Semnătură"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Introducere directă"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr " Nume:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Rezultat comandă"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Pune semnătura înaintea citării (nerecomandat)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Completare automată a următoarelor câmpuri de adrese"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Bcc"
 
 # obs: câmpul propriu de întoarcere când se răspunde cuiva, la conturi
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Răspuns către"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "Semnează PGP mesajele în mod implicit"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "Criptează PGP mesajele în mod implicit"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Criptează când se răspunde la un mesaj criptat"
 
 # hm ?
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "nu se poate obține lista destinatarilor."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Folosește formatul de criptare ASCII-armored"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Folosește semnătură în text clar"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Folosește cheia implicită GnuPG"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Selectează cheia după adresa de e-mail"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Specifică cheia manual"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Nume utilizator sau ID cheie:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Nu folosi SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Folosește SSL pentru conexiunea POP3"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Folosește comanda STARTTLS pentru a porni sesiunea SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Folosește SSL pentru conexiunea IMAP4"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Folosește SSL pentru conexiunea NNTP"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Trimitere (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Folosește SSL pentru conexiunea SMTP"
 
 # hm ? sau fără blocare ?
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Folosește SSL non-blocking"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Deselectați aici dacă aveți probleme cu conexiunea SSL."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "Folosește proxy SOCKS"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Nume de gazdă:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Port:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Folosește autentificare"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr " Nume:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Parolă:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Folosește proxy SOCKS la trimitere"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Specifică portul SMTP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Specifică portul POP3"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Specifică portul IMAP4"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Specifică portul NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Specifică numele de domeniu"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Director server IMAP"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Vor fi afișate numai subdosarele acestui director."
 
 # hm ?
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Șterge la ieșire toate mesajele din cache"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Pune mesajele trimise în"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Pune ciorna în"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Pune mesajele de la coadă în"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Pune mesajele șterse în"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Nu a fost introdus numele contului."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Nu a fost introdusă adresa de e-mail."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Nu a fost introdus serverul SMTP."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Nu a fost introdus numele utilizator."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Nu a fost introdus serverul POP3."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Nu a fost introdus serverul IMAP4."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Nu a fost introdus serverul NNTP."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Dosarul specificat nu este dosar de coadă."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/ru.po b/po/ru.po
index 04d4e3c1..2444adac 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2015-07-03 22:56+0300\n"
 "Last-Translator: Igor Nedoboy <sylpheedru@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -36,202 +36,207 @@ msgstr "Фильтровать спам (вручную)"
 msgid "Junk mail filter"
 msgstr "Фильтровать спам"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Соединение IMAP с %s прервано. Восстановление...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Сервер IMAP запретил команду LOGIN.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "Сбой соединения IMAP.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "Соединение IMAP с %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Сбой начала сеанса TLS.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(получение FLAGS...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "Получение сообщения %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Добавление сообщений в %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Перемещение сообщений %s в %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копирование сообщений %s в %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Удаление сообщений %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "сбой установки флага удаления: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "сбой очистки удалённых сообщений\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Удаление всех сообщений из %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "сбой установки флага удаления: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "сбой закрытия папки\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "корневая папка %s не существует\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "сбой получения LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Сбой создания \"%s\"\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Сбой создания \"%s\" внутри INBOX\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "сбой создания ящика: неудача LIST\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "сбой создания ящика\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "сбой создания ящика\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "сбой переименования ящика %s в %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "сбой удаления ящика\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Получение заголовков (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "сбой получения данных конверта.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "сбой разбора конверта: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "сбой получения конверта\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Сбой соединения с сервером IMAP: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Сбой подключения IMAP к %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "сбой получения пространства имён\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "сбой выбора папки: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "сбой выполнения команды IMAP: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "Сбой аутентификации IMAP.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Сбой авторизации IMAP.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "сбой добавления %s к %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(отправка файла...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "сбой добавления сообщения к %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "сбой копирования %s в %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "сбой команды IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "сбой команды IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "сбой команды IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "сбой преобразования iconv из UTF-7 в %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "сбой преобразования iconv из %s в UTF-7\n"
@@ -507,7 +512,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "сбой сеанса POP\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "сбой записи настроек в файл\n"
@@ -559,50 +564,50 @@ msgstr "неверный ответ SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "сбой сеанса SMTP\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 недоступен\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 доступен\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 недоступен\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 доступен\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "Метод SSL недоступен\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Неизвестный метод SSL *СБОЙ ПРОГРАММЫ*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Сбой создания контекста SSL\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Соединение SSL с использованием %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Сертификат сервера:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Субъект: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Сертификат выдал: %s\n"
@@ -662,7 +667,7 @@ msgstr ""
 "программой (см. справку Sylpheed), иначе обратитесь в Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -698,14 +703,14 @@ msgstr ""
 "\"G\" учётные записи для проверки командой \"Получить все\"."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Название"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -833,13 +838,13 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Новый контакт"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Адреса"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Заметки"
 
@@ -851,7 +856,7 @@ msgstr "Выберите папку в адресной книге"
 msgid "Auto-registered address"
 msgstr "Автосохранённые"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Файл"
@@ -872,10 +877,10 @@ msgstr "/_Файл/_Создать связь JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/_Создать подключение LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Файл/---"
@@ -892,21 +897,21 @@ msgstr "/_Файл/_Удалить"
 msgid "/_File/_Save"
 msgstr "/_Файл/_Сохранить"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Файл/_Закрыть"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Правка"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Правка/_Копировать"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Правка/_Вставить"
 
@@ -950,7 +955,7 @@ msgstr "/_Адрес/_Правка"
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Удалить"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Инструменты"
@@ -963,12 +968,12 @@ msgstr "/_Инструменты/_Импорт файла LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Инструменты/_Импорт файла CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Помощь"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Помощь/_О программе..."
@@ -986,7 +991,7 @@ msgid "/New _Folder"
 msgstr "/_Создать папку"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1028,7 +1033,7 @@ msgstr "Адресная книга"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Папка"
 
@@ -1040,17 +1045,17 @@ msgstr "Email"
 msgid "Search:"
 msgstr "Поиск:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Скрытая:"
@@ -1254,7 +1259,7 @@ msgstr "Общие контакты"
 msgid "Personal address"
 msgstr "Личные контакты"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1310,392 +1315,397 @@ msgstr "Коричневый"
 msgid "None"
 msgstr "Нет"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Открыть"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Добавить..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Удалить"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Свойства..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Файл/_Отправить"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Файл/_В очередь"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Файл/_Сохранить и закрыть"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Файл/_Сохранить"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Файл/_Вложить файл"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Файл/_Вставить текст из файла"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Файл/_Вставить подпись"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Файл/_Подписать в конце"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Правка/_Отменить"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Правка/_Повторить"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Правка/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Правка/_Вырезать"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Правка/_Вставить как цитату"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Правка/_Выделить всё"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Правка/_Разорвать строки в абзаце"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Правка/_Разорвать все длинные строки"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Правка/_Авторазрыв длинных строк"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Вид"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Вид/_Кому"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Вид/_Копия"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Вид/_Скрытая копия"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/_Вид/_Адрес для ответа"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Вид/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/_Вид/_Адрес следования"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Вид/_Линейка"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Вид/_Вложения"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Вид/_Настройка панели..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Вид/_Кодировка"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Вид/_Кодировка/_Авто"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Вид/_Кодировка/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Вид/_Кодировка/_7-бит ASCII(US-ASCII)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Вид/_Кодировка/_Юникод (UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Вид/_Кодировка/_Западноевропейская (ISO-8859-1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Вид/_Кодировка/_Западноевропейская (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Вид/_Кодировка/_Центральноевропейская (ISO-8859-2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Вид/_Кодировка/_Прибалтийская (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Вид/_Кодировка/_Прибалтийская (ISO-8859-4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Вид/_Кодировка/_Прибалтийская (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Вид/_Кодировка/_Греческая (ISO-8859-7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Вид/_Кодировка/_Арабская (ISO-8859-6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Вид/_Кодировка/_Арабская (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Вид/_Кодировка/_Иврит (ISO-8859-8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Вид/_Кодировка/_Иврит (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Вид/_Кодировка/_Турецкая (ISO-8859-9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Вид/_Кодировка/_Кириллица (ISO-8859-5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Вид/_Кодировка/_Кириллица (KOI8-R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Вид/_Кодировка/_Кириллица\\/Украина (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Вид/_Кодировка/_Кириллица (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Вид/_Кодировка/_Японская (ISO-2022-JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Вид/_Кодировка/_Китайская упрощённая (GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Вид/_Кодировка/_Китайская упрощённая (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Вид/_Кодировка/_Китайская традиционная (Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Вид/_Кодировка/_Корейская (EUC-KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Вид/_Кодировка/_Тайская (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Вид/_Кодировка/_Тайская (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Инструменты/_Адресная книга"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Инструменты/_Шаблоны"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Инструменты/_Действия"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Инструменты/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Инструменты/_Внешний редактор"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Инструменты/_Уведомление о прочтении"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Инструменты/_Подписать"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Инструменты/_Шифровать"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Инструменты/_Проверка орфографии"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Инструменты/_Язык проверки"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не существует\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Сбой получения части текста\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Неверный формат метки цитирования."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Неверный формат шаблона ответа/пересылки."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Сбой определения размера файла %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Сбой чтения %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Сбой получения части составного сообщения."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "без темы"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "Новое - %s%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Подпись"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Тема не указана"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Вложения отсутствуют"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Вложения отсутствуют. Отправить без вложений?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Проверка получателей"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Отправить сообщения по этим адресам?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "_Отправить"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
@@ -1703,49 +1713,49 @@ msgstr ""
 "Выполняется проверка почты.\n"
 "Повторите позже."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "сбой определения списка получателей."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr "Выберите учётную запись для отправки почты."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Сбой отправки сообщения на %s ."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr "Сообщения отправлены, но не сохранены в исходящих."
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному ID \"%s\"."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "Невозможно подписать сообщение."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "Невозможно зашифровать сообщение."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "Невозможно зашифровать или подписать сообщение."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "сбой изменения свойств файла\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1756,11 +1766,11 @@ msgstr ""
 "\n"
 "Отправить его в кодировке %s?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Сбой преобразования кодировки"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1773,15 +1783,15 @@ msgstr ""
 "\n"
 "Отправить сообщение?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Слишком длинная строка"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Зашифровать с Bcc"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1794,94 +1804,104 @@ msgstr ""
 "\n"
 "Отправлять?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "сбой удаления старого сообщения\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "сбой размещения в очереди\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не найден"
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Сбой открытия файла %s."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Подписать"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "Шифровать"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Подпись"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Проверка подписи"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "Файл не существует."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Открытие исполняемого файла"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1893,12 +1913,12 @@ msgstr ""
 "Для запуска файла необходимо сохранить его на диске. Убедитесь, что файл не "
 "содержит вирусов и других опасных программ."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1907,48 +1927,48 @@ msgstr ""
 "Внешний редактор ещё работает.\n"
 "Завершить процесс (ID: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "_Настройка панели..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Сбой постановки в очередь."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Сохранение сообщения"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Сообщение изменено. Сохранить в черновиках?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "_Не сохранять"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Заменить"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Вставить"
 
@@ -1989,7 +2009,7 @@ msgid "Nick Name"
 msgstr "Псевдоним"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Email"
 
@@ -2047,7 +2067,7 @@ msgid " Check File "
 msgstr "Проверить"
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Файл"
 
@@ -2055,62 +2075,62 @@ msgstr "Файл"
 msgid "Add New Address Book"
 msgstr "Новая адресная книга"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Необходимо указать название группы."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Изменение сведений о группе"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Название группы"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Доступные адреса"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Адреса в группе"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Добавляйте и удаляйте контакты в группе кнопками со стрелками"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Изменение сведений о группе"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Новая группа"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Изменить имя папки"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -2127,7 +2147,7 @@ msgid "Edit JPilot Entry"
 msgstr "Изменение связи JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2192,7 +2212,7 @@ msgstr "Время ожидания (сек)"
 msgid "Maximum Entries"
 msgstr "Ограничение количества записей"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Основные"
 
@@ -2278,7 +2298,7 @@ msgid "MH (number only)"
 msgstr "MH (только число)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Выбор... "
 
@@ -2459,12 +2479,12 @@ msgstr "Запись сведений о папке...\n"
 msgid "Setting folder info..."
 msgstr "Запись сведений о папке..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
@@ -3278,682 +3298,692 @@ msgstr ""
 "Обнаружены настройки, сделанные в предыдущей версии.\n"
 "Использовать их?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Файл/_Папка"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Файл/_Папка/_Создать папку..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Файл/_Папка/_Переименовать папку..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Файл/_Папка/_Переместить папку..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Файл/_Папка/_Удалить папку"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Файл/_Ящик"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Файл/_Ящик/_Создать ящик..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Файл/_Ящик/_Удалить ящик..."
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Файл/_Ящик/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Файл/_Ящик/_Получить новые сообщения"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Файл/_Ящик/_Получить во всех папках"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Файл/_Ящик/_Перестроить список папок"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_Файл/_Импорт почты..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_Файл/_Экспорт почты..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Файл/_Очистить все корзины"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Файл/_Сохранить как..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Файл/_Параметры страницы..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Файл/_Печать..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Файл/_Автономный режим"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Файл/_Выход"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Правка/_Выделить цепочку"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Правка/_Найти в сообщении..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Правка/_Поиск сообщений..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/_Правка/_Быстрый поиск"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Вид/_Показать"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Вид/_Показать/_Список папок"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Вид/_Показать/_Область просмотра"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Вид/_Показать/_Панель инструментов"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Вид/_Показать/_Панель инструментов/_Значки и текст"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Вид/_Показать/_Панель инструментов/_Текст справа"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Вид/_Показать/_Панель инструментов/_Значки"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Вид/_Показать/_Панель инструментов/_Текст"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Вид/_Показать/_Панель инструментов/_Нет"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Вид/_Показать/_Быстрый поиск"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Вид/_Показать/_Строка состояния"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Вид/_Настройка панели..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/_Вид/_Разбивка окна"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Вид/_Разбивка окна/_Обычная"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/_Вид/_Разбивка окна/_Вертикальная"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Вид/_Открепить список папок"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Вид/_Открепить область просмотра"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Вид/_Сортировка"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Вид/_Сортировка/_Номер"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Вид/_Сортировка/_Размер"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Вид/_Сортировка/_Дата"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Вид/_Сортировка/_Дата цепочки"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Вид/_Сортировка/_Отправитель"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Вид/_Сортировка/_Получатель"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Вид/_Сортировка/_Тема"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Вид/_Сортировка/_Цвет"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Вид/_Сортировка/_Важное"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Вид/_Сортировка/_Не прочитано"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Вид/_Сортировка/_Вложение"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Вид/_Сортировка/_Нет"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Вид/_Сортировка/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Вид/_Сортировка/_Возрастание"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Вид/_Сортировка/_Убывание"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Вид/_Сортировка/_Группировать по теме"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Вид/_Объединить в цепочки"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Вид/_Развернуть цепочки"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Вид/_Свернуть цепочки"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Вид/_Столбцы..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Вид/_Переход"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Вид/_Переход/_Предыдущее сообщение"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Вид/_Переход/_Следующее сообщение"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Вид/_Переход/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Вид/_Переход/_Предыдущее непрочитанное"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Вид/_Переход/_Следующее непрочитанное"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Вид/_Переход/_Предыдущее новое"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Вид/_Переход/_Следующее новое"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Вид/_Переход/_Предыдущее важное"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Вид/_Переход/_Следующее важное"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Вид/_Переход/_Предыдущее цветное"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Вид/_Переход/_Следующее цветное"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Вид/_Переход/_Папка..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Вид/_Кодировка/_Авто"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Вид/_Кодировка/_Западно-Европейская (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Вид/_Кодировка/_Японская (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Вид/_Кодировка/_Японская (EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Вид/_Кодировка/_Японская (Shift-JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Вид/_Кодировка/_Китайская традиционная (EUC-TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Вид/_Кодировка/_Китайская (ISO-2022-CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Вид/_Кодировка/_Корейская (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Вид/_В новом окне"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Вид/_Исходный текст"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/_Вид/_Все заголовки"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Вид/_Обновить список сообщений"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Сообщение"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_Сообщение/_Получить"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Сообщение/_Получить/_С текущей учётной записи"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Сообщение/_Получить/_Со всех учётных записей"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Сообщение/_Получить/_Прервать получение"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Сообщение/_Получить/_Диспетчер почты..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Сообщение/_Получить/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Сообщение/_Отправить из очереди"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Сообщение/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Сообщение/_Создать сообщение"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Сообщение/_Ответить"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Сообщение/_Ответить..."
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Сообщение/_Ответить.../_Всем"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Сообщение/_Ответить.../_Отправителю"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Сообщение/_Ответить.../_В рассылку"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Сообщение/_Переслать"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Сообщение/_Переслать вложением"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Сообщение/_Перенаправить"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Сообщение/_Переместить..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Сообщение/_Копировать..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Сообщение/_Метка"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Сообщение/_Метка/_Важное"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Сообщение/_Метка/_Обычное"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Сообщение/_Метка/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Сообщение/_Метка/_Не прочитано"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Сообщение/_Метка/_Прочитано"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Сообщение/_Метка/_Цепочка прочитана"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Сообщение/_Метка/_Все прочитаны"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Сообщение/_Удалить"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Сообщение/_Спам"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Сообщение/_Не спам"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Сообщение/_Редактировать"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Инструменты/_Сохранить адрес..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Инструменты/_Фильтровать всю папку"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Инструменты/_Фильтровать выбранные"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Инструменты/_Создать фильтр"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Инструменты/_Создать фильтр/_Авто"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Инструменты/_Создать фильтр/_Отправитель"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Инструменты/_Создать фильтр/_Получатель"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Инструменты/_Создать фильтр/_Тема"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Инструменты/_Фильтровать спам в папке"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Инструменты/_Фильтровать спам в выбранных"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Инструменты/_Удалить дубликаты сообщений"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Инструменты/_Объединить составные сообщения"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Инструменты/_Обработать помеченные"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Инструменты/_Фильтровать спам в папке"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Инструменты/_Фильтровать всю папку"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Инструменты/_Журнал работы"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Настройка"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Настройка/_Общие настройки..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Настройка/_Фильтры..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Настройка/_Шаблоны..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Настройка/_Действия..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Настройка/_Плагины..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Настройка/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Настройка/_Настроить учётную запись... "
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Настройка/_Создать учётную запись..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Настройка/_Учётные записи..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Настройка/_Текущая учётная запись"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Помощь/_Справка"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Помощь/_Справка/_English"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Помощь/_Справка/_Japanese"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Помощь/_FAQ"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Помощь/_FAQ/_English"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Помощь/_FAQ/_German"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Помощь/_FAQ/_Spanish"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Помощь/_FAQ/_French"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Помощь/_FAQ/_Italian"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Помощь/_Параметры запуска"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Помощь/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/_Помощь/_Обновить Sylpheed"
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/_Помощь/_Обновить плагины"
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Создание главного окна...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "выполнено.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Без названия"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "нет"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Автономный режим"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Вы работаете в автономном режиме. Подключиться к сети?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Очистить все корзины"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Новый ящик"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3963,16 +3993,16 @@ msgstr ""
 "Если будет указан существующий ящик,\n"
 "он будет проверен автоматически."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Ящик \"%s\" уже существует."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Ящик"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3981,95 +4011,95 @@ msgstr ""
 "Сбой создания почтового ящика.\n"
 "Возможно, некоторые файлы уже существуют, или отсутствуют права на запись."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Ответить"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/_Всем"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/_Отправителю"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/_В рассылку"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Переслать"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/_Вложением"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/_Перенаправить"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "_Значки и текст"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "_Текст справа"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "_Значки"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_Текст"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_Нет"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Вы работаете в автономном режиме."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы подключены к сети."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Выйти из программы?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "Невозможно объединить выбранные сообщения."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Выбор папки"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Параметры запуска"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Синтаксис: sylpheed [ПАРАМЕТР]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4103,7 +4133,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4137,15 +4167,15 @@ msgstr ""
 "это сообщение\n"
 "сведения о версии"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Только в Windows:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport номер порта"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "указать порт для удалённых команд IPC"
 
@@ -4376,476 +4406,480 @@ msgstr "Файл: "
 msgid "Description: "
 msgstr "Описание: "
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Открытие окна настроек учётной записи...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Учётная запись %d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Создание учётной записи"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Настройки учётной записи"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Создание окна настроек учётной записи...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Получить"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Отправить"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Создать"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Шифрование"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Прокси"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Ещё"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Название"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "По умолчанию"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Личные сведения"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Ваше имя"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Email"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Организация"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Параметры сервера"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "NNTP (новостной)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Нет (локальный)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Требуется аутентификация"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Сервер новостей"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Сервер входящей почты"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Сервер исходящей почты"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Логин"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Пароль"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Безопасная аутентификация (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Удалять сообщения с сервера после получения"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Удалять через"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "дней"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 дней: удалять немедленно"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Получать все сообщения (включая уже полученные)"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Получать сообщения не более"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "КБ"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Фильтровать сообщения при получении"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Папка входящих сообщений"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Неотфильтрованные сообщения сохраняются в этой папке."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Метод аутентификации"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Авто"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Проверять только папку входящих"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Фильтровать новые сообщения во входящих"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Новости"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Лимит количества статей для загрузки"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "0 - без ограничений."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "Проверять командой \"Получить все\""
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Заголовок"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Создавать поле Date"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Создавать Message-ID"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Дополнительные заголовки"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr "Настроить..."
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Аутентификация"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Аутентификация SMTP"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 "Если поля не заполнены, используются логин и пароль для входящей почты."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Аутентификация POP перед SMTP"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Подпись"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Прямой ввод"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Название:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Вывод команды"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Перед цитатой (не рекомендуется)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Автозаполнение полей"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Копия"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Скрытая"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Ответ"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "Подписывать сообщения по умолчанию"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "Шифровать сообщения по умолчанию"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Шифровать ответы на зашифрованные сообщения"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 msgid "Add my own key to the recipients list on encryption"
 msgstr "Добавить свой ключ к списку получателей при шифровании"
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII-кодирование при шифровании"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Подпись в формате \"Только текст\""
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr "Подпись / Ключ шифрования"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Ключ GnuPG по умолчанию"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Соответствующий учётной записи"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Задать"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "ID ключа:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Без SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSL/STARTTLS"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "SMTP"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Неблокирующий режим SSL"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Отключите при проблемах с подключением SSL."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "SOCKS-прокси"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Адрес:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Аутентификация"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Название:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Использовать при отправке"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Порт SMTP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Порт POP"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Порт IMAP"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Порт NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Имя домена"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Префикс пути IMAP"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Отображаются только подпапки этой папки."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Очищать кэш сообщений при выходе"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Поместить отправленные в"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Поместить черновики в"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Поместить сообщения в очереди в"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Поместить удалённые в"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Не задано имя учётной записи."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Не задан адрес email."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Не задан сервер SMTP."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Не задан логин."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Не задан сервер POP."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Не задан сервер IMAP."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Не задан сервер NNTP."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Указанная папка не является папкой очереди."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/sk.po b/po/sk.po
index 1e615cf5..f5fc1fe1 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: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+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"
@@ -31,205 +31,210 @@ msgstr "Priečinok"
 msgid "Junk mail filter"
 msgstr "Priečinok"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojenie k %s sa prerušilo. Znovu pripájam...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Priečinok serveru IMAP"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 #, fuzzy
 msgid "Could not establish IMAP connection.\n"
 msgstr "Nedá sa vytvoriť IMAP4 spojenie s: %s:%d\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "vytváram IMAP4 spojenie k %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Nedá sa vytvoriť TLS spojenie.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, fuzzy, c-format
 msgid "Getting message %u"
 msgstr "Odstraňujem správu %d"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Prijímam správy z %s..."
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nedá sa nastaviť príznak zmazania: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "nedá sa odstrániť\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Prijímam správy z %s..."
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nedá sa nastaviť príznak zmazania: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "priečinok sa nedá zatvoriť\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "koreňový priečinok %s neexistuje\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "pri príkaze LIST sa vyskytla chyba.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nedá sa vytvoriť '%s'\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nedá sa vytvoriť '%s' v INBOXe\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nedá sa vytvoriť schránka: príkaz LIST zlyhal\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "nedá sa vytvoriť schránka\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "nedá sa vytvoriť schránka\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nedá sa premenovať schránka: %s na %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "schránka sa nedá odstrániť \n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "pri získavaní obálky sa vyskytla chyba.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "obálka sa nedá prečítať: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "obálka sa nedá načítať\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nedá sa pripojiť k serveru IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nedá sa vytvoriť IMAP4 spojenie s: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "nedá sa nájsť obálka\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "priečinok sa nedá vytvoriť: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentizácia bola neúspešná.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "neúspešné prihlásenie k IMAP4.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nedá sa napojiť %s k %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(posielam súbor...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nedá sa napojiť správa k %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nedá sa kopírovať %s do %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba pri IMAP príkaze: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba pri IMAP príkaze: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
@@ -500,7 +505,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "vyskytla sa chyba pri POP3 spojení\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "nepodarilo sa zapísať nastavenie do súboru\n"
@@ -552,50 +557,50 @@ msgstr "neplatná odozva SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "vyskytla sa chyba pri SMTP spojení\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 nie je dostupné\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 je dostupné\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 nie je dostupné\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 je dostupné\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "Metóda SSL nie je dostupná\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Neznáma metóda SSL *CHYBA PROGRAMU*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Pri vytváraní SSL kontextu sa vyskytla chyba\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL spojenie pri použití %s zlyhalo\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Certifikát serveru:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Predmet: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Vydavateľ: %s\n"
@@ -653,7 +658,7 @@ 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_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -692,14 +697,14 @@ msgstr ""
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Meno"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -829,13 +834,13 @@ msgstr "Používateľský parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Pridať adresu do adresára"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Adresár"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Poznámky"
 
@@ -848,7 +853,7 @@ msgstr "Vyberte priečinok adresára"
 msgid "Auto-registered address"
 msgstr "Registrované pravidlá"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Súbor"
@@ -870,10 +875,10 @@ msgstr "/_Súbor/Nový _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Súbor/---"
@@ -890,21 +895,21 @@ msgstr "/_Súbor/Z_mazať"
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
@@ -951,7 +956,7 @@ msgstr "/_Adresa/_Upraviť"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -965,12 +970,12 @@ msgstr "/_Nástroje/Importovať súbor _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
@@ -988,7 +993,7 @@ msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1032,7 +1037,7 @@ msgstr "Otvoriť adresár"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Priečinok"
 
@@ -1045,17 +1050,17 @@ msgstr "E-mailová adresa"
 msgid "Search:"
 msgstr "Hľadať"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Slepá kópia:"
@@ -1270,7 +1275,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1326,448 +1331,453 @@ msgstr "Hnedá"
 msgid "None"
 msgstr "Žiadna"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Otvoriť"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Pridať..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Odstrániť"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/compose.c:581
+#: src/compose.c:586
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/Sp_ráva/Odoslať _neskôr"
 
-#: src/compose.c:584
+#: src/compose.c:589
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/Sp_ráva/_Uložiť medzi koncepty"
 
-#: src/compose.c:586
+#: src/compose.c:591
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/Sp_ráva/Uložiť a _pokračovať v editácii"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Súbor/_Pripojiť súbor"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Súbor/_Vložiť súbor"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Súbor/V_ložiť podpis"
 
-#: src/compose.c:593
+#: src/compose.c:598
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Súbor/V_ložiť podpis"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu urobiť"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vystrihnúť"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Prilepiť ako _citáciu"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vy_brať všetko"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/_Zalomiť aktuálny odstavec"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zalomiť všetky _dlhé riadky"
 
-#: src/compose.c:612
+#: src/compose.c:617
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Zobraziť"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Zobraziť/_Komu"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Zobraziť/Kó_pia"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Zobraziť/_Slepá kópia"
 
-#: src/compose.c:617
+#: src/compose.c:622
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Zobraziť/_Odpoveď komu"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Zobraziť/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Zobraziť/O_dovzdať komu"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Zobraziť/P_ravítko"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Zobraziť/Prí_lohy"
 
-#: src/compose.c:625
+#: src/compose.c:630
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Zobraziť/_Kódovanie/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Zobraziť/_Kódovanie/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Zobraziť/_Kódovanie/Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Zobraziť/_Kódovanie/_Pobaltie (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Zobraziť/_Kódovanie/Turecko (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Úp_ravy/Upraviť e_xterným editorom"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:728
+#: src/compose.c:733
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:733
+#: src/compose.c:738
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Nástroje/V_ykonať"
 
-#: src/compose.c:734
+#: src/compose.c:739
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Nedá sa získať časť textu\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Podpis"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 #, fuzzy
 msgid "Empty subject"
 msgstr "Predmet"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Prílohy"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 #, fuzzy
 msgid "_Send"
 msgstr "Odoslať"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1775,42 +1785,42 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, 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:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1821,12 +1831,12 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1835,15 +1845,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1852,98 +1862,108 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Nemôžem otvoriť súbor %s\n"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Dátum"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Podpis"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Overujem podpis"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: súbor neexistuje\n"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1951,12 +1971,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1966,52 +1986,52 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -2053,7 +2073,7 @@ msgid "Nick Name"
 msgstr "Prezývka"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-mailová adresa"
 
@@ -2112,7 +2132,7 @@ msgid " Check File "
 msgstr "Testovať súbor"
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Súbor"
 
@@ -2121,63 +2141,63 @@ msgstr "Súbor"
 msgid "Add New Address Book"
 msgstr "Pridať nový adresár"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Musíte zadať názov skupiny."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Upraviť údaje skupiny"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Názov skupiny"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Dostupné adresy"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Adresy v skupine"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "E-mailové adresy môžte presúvať z a do skupiny pomocou tlačítok so šípkami"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Upraviť detaily skupiny"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Pridať novú skupinu"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Upraviť priečinok"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
@@ -2194,7 +2214,7 @@ msgid "Edit JPilot Entry"
 msgstr "Upraviť záznam JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2259,7 +2279,7 @@ msgstr "Timeout (v sekundách)"
 msgid "Maximum Entries"
 msgstr "Maximum záznamov"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Základné"
 
@@ -2352,7 +2372,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr "Zvoľte..."
 
@@ -2547,12 +2567,12 @@ msgstr "Nastavujem informácie o priečinku...\n"
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
@@ -3396,729 +3416,739 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Súbor/P_riečinok"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Súbor/P_riečinok/Vytvoriť _nový priečinok..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Súbor/P_riečinok/P_remenovať priečinok..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Súbor/P_riečinok/P_remenovať priečinok..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Súbor/P_riečinok/O_dstrániť priečinok"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Súbor/_Pridať schránku..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Súbor/_Pridať schránku..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Odstrániť schránku"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Súbor/P_riečinok/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/P_rijať nové správy"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Súbor/P_riečinok/Pri_jať nové správy vo všetkých priečinkoch"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_bnoviť štruktúru priečinkov"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 #, fuzzy
 msgid "/_File/_Import mail data..."
 msgstr "/_Súbor/_Importovať súbor mbox..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_File/_Export mail data..."
 msgstr "/_Súbor/_Exportovať do súboru mbox..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Súbor/Vyčistiť odpadkový _kôš"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Súbor/_Uložiť ako..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Súbor/_Uložiť ako..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Súbor/_Tlačiť..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Súbor/P_racovať odpojený"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Súbor/Uk_ončiť"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/Ú_pravy/Zvoliť _vlákno"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/Vy_hľadať v aktuálnej správe..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/Ú_pravy/_Vyhľadať v správach..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 #, fuzzy
 msgid "/_Edit/_Quick search"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Zobraziť/_Ukázať alebo skryť"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Strom priečinkov"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Zobrazenie správy"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/Ikony _a text"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Ikony"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Ikony"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Text"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/Žiad_ne"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/Stavový _riadok"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/Stavový _riadok"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 #, fuzzy
 msgid "/_View/Layou_t"
 msgstr "/_Zobraziť/_Triediť"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 #, fuzzy
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Zobraziť/_Triediť/podľa _odosielateľa"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr ""
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Zobraziť/Samostatný str_om priečinkov"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Zobraziť/Samostatné zobraz_enie správy"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Zobraziť/_Triediť"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Zobraziť/_Triediť/podľa čí_sla"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Zobraziť/_Triediť/podľa _veľkosti"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Zobraziť/_Triediť/podľa _dátumu"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Zobraziť/_Triediť/podľa _dátumu"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Zobraziť/_Triediť/podľa _odosielateľa"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Zobraziť/_Triediť/podľa _príjemcu"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Zobraziť/_Triediť/podľa p_redmetu"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Zobraziť/_Triediť/podľa _farebného označenia"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Zobraziť/_Triediť/podľa _značky"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Zobraziť/_Triediť/podľa pr_ečítania"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Zobraziť/_Triediť/podľa prí_loh"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Zobraziť/_Triediť/_Netriediť"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Zobraziť/_Triediť/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Zobraziť/_Triediť/Vzostupne"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Zobraziť/_Triediť/Zos_kupiť podľa predmetu"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Zobraziť/Zobraziť _vlákna"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Zobraziť/_Rozbaliť všetky vlákna"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Zobraziť/Zba_liť všetky vlákna"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Zobraziť/Nastav_iť zobrazované položky"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Zobraziť/Pre_jsť na"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Zobraziť/Pre_jsť na/_Predošlú správu"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Zobraziť/Pre_jsť na/Ď_alšiu správu"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Zobraziť/Pre_jsť na/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Zobraziť/Pre_jsť na/P_redošlú neprečítanú správu"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu n_eprečítanú správu"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú no_vú správu"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalši_u novú správu"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú _označenú správu"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu o_značenú správu"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú správu s návestí_m"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďa_lšiu správu s návestím"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Zobraziť/_Kódovanie/_Automatické"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Zobraziť/_Kódovanie/Čínština (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Zobraziť/Otvoriť v _novom okne"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Zobraziť/Zdrojový kód správ_y"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Zobraziť/Všetky _hlavičky"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/Sp_ráva"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/Sp_ráva/_Prijať"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Sp_ráva/_Prijať/Z _aktuálneho konta"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Sp_ráva/_Prijať/Zo _všetkých kônt"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/Sp_ráva/_Prijať/_Ukončiť prijímanie"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/Sp_ráva/_Prijať/Zo _všetkých kônt"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/Sp_ráva/_Prijať/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/Sp_ráva/_Odoslať správy vo fronte"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/Sp_ráva/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/Sp_ráva/_Napísať novú správu"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/Sp_ráva/O_dpovedať"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/Sp_ráva/Odpo_vedať komu"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Sp_ráva/Odpoved_ať komu/_všetkým"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Sp_ráva/Od_povedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Sp_ráva/Od_povedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/Sp_ráva/_Poslať ďalej"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/Sp_ráva/Poslať ako p_rílohu"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/Sp_ráva/Pre_smerovať"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/Sp_ráva/Pres_unúť"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/Sp_ráva/_Kopírovať"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/Sp_ráva/O_značiť"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 #, fuzzy
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/Sp_ráva/O_značiť/O_značiť"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/Sp_ráva/O_značiť/O_dznačiť"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/Sp_ráva/O_značiť/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _neprečítané"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _prečítané"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _prečítané"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Sp_ráva/O_značiť/Označiť _všetky ako prečítané"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/Sp_ráva/Z_mazať"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Sp_ráva/_Odoslať"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/Sp_ráva/Znovu _editovať"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Nástroje/Pridať _odosielateľa do adresára"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/_Automaticky"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _odosielateľa"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _príjemcu"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa p_redmetu"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/Zmazať du_plikátne správy"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 #, fuzzy
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Nástroje/Zmazať du_plikátne správy"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Vykonať označený proces"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Nástroje/_Filtrovať správy"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Nástroje/_Filtrovať správy"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamu"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/Nastav_enia"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_enia/_Všeobecné nastavenia..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 #, fuzzy
 msgid "/_Configuration/_Filter settings..."
 msgstr "/Nastav_enia/Nastavenie _filtru..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_enia/Š_ablóna..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_enia/_Akcie..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 #, fuzzy
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/Nastav_enia/Š_ablóna..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/Nastav_enia/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_enia/Nastavenia aktívneho _konta..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_enia/Vytvoriť _nové konto..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_enia/_Upraviť kontá..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_enia/_Zmeniť aktívne konto"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/Nápo_veda/_Manuál"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_veda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_veda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_veda/_FAQ"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_veda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_veda/_FAQ/_Japonsky"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_veda/_FAQ/Š_panielsky"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_veda/_FAQ/_Francúzky"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_veda/_FAQ/_Taliansky"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/Nápo_veda/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr ""
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr ""
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Vytváram hlavné okno...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Odpojené"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Ste odpojený. Pripojiť sa?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -4129,16 +4159,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4148,104 +4178,104 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Ikony"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 #, fuzzy
 msgid "_Text"
 msgstr "Text"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 #, fuzzy
 msgid "_None"
 msgstr "Žiadna"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojený. Kliknite na ikonu, ak sa chcete pripojiť."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojený. Kliknite na ikonu, ak sa chcete odpojiť."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Zvoľte priečinok"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 #, fuzzy
 msgid "Command line options"
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4264,7 +4294,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4283,15 +4313,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4539,246 +4569,246 @@ msgstr "Súbor"
 msgid "Description: "
 msgstr "Popis"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Otváram okno nastavenia konta...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Nastavenie nového konta"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Nastavenie konta"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Vytváram okno nastavenia konta...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Prijať"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Odoslať"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Nová správa"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Súkromie"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Názov tohto konta"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Nastaviť ako východzie"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Osobné informácie"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Celé meno"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "E-mailová adresa"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organizácia"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Informácie o serveri"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Žiadne (lokálne)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizáciu"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "News server"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Server pre prijímanie"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Prihlasovacie meno"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Heslo"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Tento server vyžaduje autentizáciu"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na serveri po ich prijatí"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Vymazať po"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "dňoch"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dní: zmazať ihneď)"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Prijať všetky správy na serveri"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Obmedzenie veľkosti správy pre príjem"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Východzí inbox"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Metóda autentizácie"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automatická"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Len pri manuálnom prijímaní"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Diskusné skupiny"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Maximálny počet príspevkov na stiahnutie\n"
 "(0 pre neobmedzený počet)"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Nie je určený príjemca."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "Pri voľbe 'Prijať všetko' prijať správy aj pre toto konto"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Hlavička"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Pridať dátum do hlavičky"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Generovať Message-ID"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Pridať uživateľom definované hlavičky"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Upresniť... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Autentizácia"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentizácia (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4787,251 +4817,255 @@ msgstr ""
 "Ak necháte tieto polia prázdne, bude použité to isté\n"
 "prihlasovacie meno a heslo ako pri prijímaní."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizovať cez POP3 pred odosielaním"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Meno:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Výstup príkazu"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Kópia"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Slepá kópia"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Odpovedať komu"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Implicitne podpísať správu"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Implicitne zašifrovať správu"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Šifrovať do ASCII-armored tvaru"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Podpísať čistým textom"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Použiť východzí kľúč GnuPG"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Zvoliť kľúč podľa vašej emailovej adresy"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Zadať kľúč ručne"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "User alebo key ID:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Nepoužívať SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Použiť SSL pre POP3 spojenie"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Použiť príkaz STARTTLS pre nadviazanie SSL spojenia"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Použiť SSL pre IMAP4 spojenie"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Použiť SSL pre NNTP spojenie"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Použiť SSL pre SMTP spojenie"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Používať non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(Vypnite túto voľbu ak máte problémy pri SSL spojeniach)"
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 #, fuzzy
 msgid "Hostname:"
 msgstr "Názov počítača"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 #, fuzzy
 msgid "Port:"
 msgstr "Port"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 #, fuzzy
 msgid "Use authentication"
 msgstr "Autentizácia"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Meno:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 #, fuzzy
 msgid "Password:"
 msgstr "Heslo"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 #, fuzzy
 msgid "Use SOCKS proxy on sending"
 msgstr "Pre odosielanie použiť externý program"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Určiť SMTP port"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Určiť POP3 port"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Určiť IMAP4 port"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Určiť NNTP port"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Určiť názov domény"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Priečinok serveru IMAP"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Prijať všetky správy na serveri"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov konta."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Nebola zadaná e-mailová adresa."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Nebol zadaný SMTP server."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Nebol zadaný user ID."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Nebol zadaný POP3 server."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Nebol zadaný IMAP4 server."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Nebol zadaný NNTP server."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/sl.po b/po/sl.po
index acc4f30a..81aa32a6 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: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+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"
@@ -29,210 +29,215 @@ msgstr "Mapa"
 msgid "Junk mail filter"
 msgstr "Mapa"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Povezava IMAP4 do %s%d se je prekinila. Povezujem se znova...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Imenik strežnika IMAP"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 #, fuzzy
 msgid "Could not establish IMAP connection.\n"
 msgstr "Ne morem vzpostaviti seje IMAP4 z: %s%d\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "delam povezavo IMAP4 do %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Ne morem pričeti seje TLS.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, fuzzy, c-format
 msgid "Getting message %u"
 msgstr "Brišem sporočilo %d"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Prestavljam sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne morem nastaviti izbrisanih zastavic: %d\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "ne morem izbrisati\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne morem nastaviti izbrisanih zastavic: 1:%d\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Datoteka z oznakami ni bila najdena.\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "med dobivanjem LIST je prišlo do napake.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ne morem narediti '%s'\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ne morem narediti '%s' pod mapo Prejeto\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne morem narediti poštnega predala: LIST ni uspel\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "ne morem narediti poštnega predala\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "ne morem narediti poštnega predala\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne morem preimenovati poštnega predala: %s v %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "ne morem izbrisati poštnega predala\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "med dobivanjem ovojnice je prišlo do napake.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne morem razčleniti ovojnice: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "ne morem dobiti ovojnice\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne morem se povezati s strežnikom IMAP4: %s%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne morem vzpostaviti seje IMAP4 z: %s%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "ne morem dobiti imenskega prostora\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Overovitvena metoda"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Prijava na IMAP4 ni uspela.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne morem pripeti %s na %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(pošiljam datoteko...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne morem dodati sporočila %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne morem kopirati %d na %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "napaka med IMAPovim ukazom: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne more pretvoriti %s v UTF-7\n"
@@ -505,7 +510,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "neuspešen poskus zapisa konfiguracije v datoteko\n"
@@ -558,50 +563,50 @@ msgstr ""
 msgid "error occurred on SMTP session\n"
 msgstr "Med preverjanjem istovetnosti je prišlo do napake\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 ni na razpolago\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 je na razpolago\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 ni na razpolago\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 je na razpolago\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "Metoda SSL ni na razpolago\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Neznana metoda SSL *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Napaka pri ustvarjanju konteksta ssl\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Povezava SSL z uporabo %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Certifikat strežnika:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Zadeva: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Izdajatelj: %s\n"
@@ -661,7 +666,7 @@ msgstr ""
 "programom; če ga niste, pišite na Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, ZDA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -700,14 +705,14 @@ msgstr ""
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Ime"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -835,13 +840,13 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Naslov"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Opombe"
 
@@ -854,7 +859,7 @@ msgstr "Izberite mapo za adresar"
 msgid "Auto-registered address"
 msgstr "Registrirana pravila"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -876,10 +881,10 @@ msgstr "/_Datoteka/Nov _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
@@ -896,21 +901,21 @@ msgstr "/_Datoteka/_Brisanje"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
@@ -957,7 +962,7 @@ msgstr "/_Naslov/_Urejanje"
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Orodja"
@@ -971,12 +976,12 @@ msgstr "/_Orodja/Uvoz datoteke _LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
@@ -994,7 +999,7 @@ msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1038,7 +1043,7 @@ msgstr "Imenik naslovov"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Mapa"
 
@@ -1051,17 +1056,17 @@ msgstr "Elektronski naslov"
 msgid "Search:"
 msgstr "Iskanje"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Kp:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Skp:"
@@ -1275,7 +1280,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1331,449 +1336,454 @@ msgstr "Rjava"
 msgid "None"
 msgstr "Nič"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Odpri"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Dodaj"
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Odstrani"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/compose.c:581
+#: src/compose.c:586
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Sporočilo/Poš_lji pozneje"
 
-#: src/compose.c:584
+#: src/compose.c:589
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Sporočilo/Shrani v mapo _draft"
 
-#: src/compose.c:586
+#: src/compose.c:591
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Sporočilo/Poš_lji in nadaljuj z urejanjem"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Datoteka/Pripni d_atoteko"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/Datoteka/Vr_ini datoteko"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/Datoteka/Vrini _podpis"
 
-#: src/compose.c:593
+#: src/compose.c:598
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/Datoteka/Vrini _podpis"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Uredi/_Razveljavi"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Obnovi"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/I_zreži"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/Prilepi kot _citat"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Izberi _vse"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uredi/Prelomi trenutni odstavek"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uredi/_Prelomi vse _dolge vrstice"
 
-#: src/compose.c:612
+#: src/compose.c:617
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Pogled"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Ogled/_Komu"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Ogled/K_p"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Ogled/_SKp"
 
-#: src/compose.c:617
+#: src/compose.c:622
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Ogled/_Odgovor za"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Pogled/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Pogled/_Sledi do"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Pogled/R_avnilo"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Pogled/_Priloga"
 
-#: src/compose.c:625
+#: src/compose.c:630
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pogled/Nabor zna_kov/7 bitni ASCII (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Videz/Nabor zna_kov/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pogled/Nabor zna_kov/Srednjeevropski (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pogled/Nabor zna_kov/_Baltski (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pogled/Nabor zna_kov/Turški (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pogled/Nabor zna_kov/Korejski (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi z _zunanjim urejevalnikom"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:728
+#: src/compose.c:733
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:733
+#: src/compose.c:738
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/_Orodja/_Izvrši"
 
-#: src/compose.c:734
+#: src/compose.c:739
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Podpis"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 #, fuzzy
 msgid "Empty subject"
 msgstr "Zadeva"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Priloge"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Samodejno nastavi sledeče naslove"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 #, fuzzy
 msgid "_Send"
 msgstr "Pošlji"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Preverjam nova sporočila v vseh mapah..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1781,42 +1791,42 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, 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:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, 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:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1826,12 +1836,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1840,15 +1850,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1857,99 +1867,109 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne morem odpreti datoteke %s\n"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Podpis"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Preverjam podpis"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr ""
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1957,12 +1977,12 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1972,52 +1992,52 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "To sporočilo je bilo spremenjeno. Naj ga zavržem?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -2059,7 +2079,7 @@ msgid "Nick Name"
 msgstr "Vzdevek"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Elektronski Naslov"
 
@@ -2118,7 +2138,7 @@ msgid " Check File "
 msgstr " Preveri Datoteko "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Datoteka"
 
@@ -2127,62 +2147,62 @@ msgstr "Datoteka"
 msgid "Add New Address Book"
 msgstr "Dodaj nov imenik naslovov"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Ime skupine mora biti podano."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Urejanje podatkov o skupini"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Ime skupine"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Razpoložljivi naslovi"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Naslovi v skupini"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Prestavljate naslove v ali iz skupine s klikanjem na puščice"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Urejanje podatkov o skupini"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Dodaj novo skupino"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Urejanje mape"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -2199,7 +2219,7 @@ msgid "Edit JPilot Entry"
 msgstr "Urejanje vnosa JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2264,7 +2284,7 @@ msgstr "Čas izteka (sek.)"
 msgid "Maximum Entries"
 msgstr "Največje št. vnosov"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -2356,7 +2376,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Izberi... "
 
@@ -2551,12 +2571,12 @@ msgstr "Nastavljam informacije o mapi...\n"
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
@@ -3394,735 +3414,745 @@ msgid ""
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Mapa"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Mapa/Naredi _novo mapo..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Mapa/_Preimenuj mapo..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datoteka/_Mapa/_Preimenuj mapo..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Mapa/I_zbriši mapo"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/_Dodaj poštni predal..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/_Dodaj poštni predal..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Odstrani poštni pre_dal"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Mapa"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Preveri nova sporočila"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Datoteka/_Preveri nova sporočila v vseh imenikih"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Ponovno z_gradi drevo map"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 #, fuzzy
 msgid "/_File/_Import mail data..."
 msgstr "/_Datoteka/_Uvozi datoteko mbox..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_File/_Export mail data..."
 msgstr "/_Datoteka/_Izvozi v datoteko mbox..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datoteka/Izprazni sme_tnjak"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/_Shrani kot..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Datoteka/_Shrani kot..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/_Natisni..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/Datoteka/Vr_ini datoteko"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/_Končaj"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Uredi/Izberi _nit"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Urejanje/_Iskanje v trenutnem sporočilu..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Urejanje/Iskanje _sporočil"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 #, fuzzy
 msgid "/_Edit/_Quick search"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Pogled/Pri_kaži ali skrij"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Drevo map"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Ogled sporočila"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/Ikone in besedi_lo"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Ikone"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Ikone"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Besedilo"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Orodjarna/_Nič"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Statusna vrstica"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Statusna vrstica"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 #, fuzzy
 msgid "/_View/Layou_t"
 msgstr "/_Pogled/_Razvrščanje"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 #, fuzzy
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Pogled/_Razvrščanje/po _pošiljatelju"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr ""
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "_Pogled/Posebno drev_o map"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pogled/Poseben ogled _sporočila"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Pogled/_Razvrščanje"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Pogled/_Razvrščanje/po š_tevilu"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Pogled/_Razvrščanje/po _velikosti"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Pogled/_Razvrščanje/po _datumu"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Pogled/_Razvrščanje/po _datumu"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Pogled/_Razvrščanje/po _pošiljatelju"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Pogled/_Razvrščanje/po naslovnik_u"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Pogled/_Razvrščanje/po _zadevi"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Pogled/_Razvrščanje/po _barvi oznak"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Pogled/_Razvrščanje/po _oznaki"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Pogled/_Razvrščanje/po _neprebranih"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Pogled/_Razvrščanje/po pri_logi"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Pogled/_Razvrščanje/Ne raz_vrsti"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Pogled/_Razvrščanje/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pogled/_Razvrščanje/N_araščajoče"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Pogled/_Razvrščanje/Pri_vlači po zadevi"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Pogled/Ogled _niti"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Pogled/Razširi _vse niti"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pogled/Skrči vse _niti"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Pogled/Nastavi kos za _prikaz..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Pogled/_Pojdi na"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Pogled/_Pojdi na/_Prejšnje sporočilo"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Pogled/_Pojdi na/_Naslednje sporočilo"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Pogled/_Pojdi na/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Pogled/_Pojdi na/Pre_jšnje neprebrano sporočilo"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Pogled/_Pojdi na/Nas_lednje neprebrano sporočilo"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje no_vo sporočilo"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Pogled/_Pojdi na/Nasled_nje novo sporočilo"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje _označeno sporočilo"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Pogled/_Pojdi na/Naslednje o_značeno sporočilo"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje sporočilo z ozna_ko"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Pogled/_Pojdi na/Naslednje sporočilo z oznako"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pogled/Nabor zna_kov/_Samodejno"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pogled/Nabor zna_kov/Kitajski (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pogled/Kodni nabor/Korejski (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Poglej/Odpri v _novem oknu"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Pogled/I_zvirnik sporočila"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Pogled/Vsa _zaglavja"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Sporočilo"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Sporočilo/Odpoved sprejeman_ja"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Sporočilo/Pošlji čakajoča sporoč_ila"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Sporočilo/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Sporočilo/_Novo sporočilo"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Sporočilo/_Odgovori"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Sporočilo/Odgovor _na"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Sporočilo/Odgovor _na/_vsem"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Sporočilo/Odgovori _na/_pošiljatelju"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Sporočilo/Odgovor _na/_dopisni seznam"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/Sporočilo/_Posreduj"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Sporočilo/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Sporočilo/Pre_usmeri"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Sporočilo/Pres_tavi..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Sporočilo/_Kopiraj..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Sporočilo/O_znači"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 #, fuzzy
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Sporočilo/O_znači/_Označi"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Sporočilo/O_znači/O_dznači"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Sporočilo/O_znači/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Sporočilo/O_znači/Označi kot _neprebrano"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Sporočilo/O_znači/Označi kot _prebrano"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Sporočilo/O_znači/Označi kot _prebrano"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Sporočilo/O_znači/Označi _vsa kot prebrana"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Sporočilo/Z_briši"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Orodja/Doda_j pošiljatelja v adresar"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/S_amodejno"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po p_ošiljatelju"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _naslovniku"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _zadevi"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Orodja/_Briši podvojena sporočila"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 #, fuzzy
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Orodja/_Briši podvojena sporočila"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Izvedi označen proces"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Orodja/_Filtriraj sporočila"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Orodja/_Filtriraj sporočila"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Orodja/_Dnevniško okno"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Prikrojitev"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Prikrojitev/_Splošne nastavitve..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 #, fuzzy
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Prikrojitev/_Nastavitve _filtra..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Prikrojitev/_Predloga..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Prikrojitev/_Dejanja..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 #, fuzzy
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Prikrojitev/_Predloga..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Prikrojitev/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Prikrojitev/_Nastavitve za trenutni _račun..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Prikrojitev/Naredi _nov račun..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Prikrojitev/_Uredi račune..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Prikrojitev/Spremeni _trenutni račun"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Pomoč/_Priročnik"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoč/_Priročnik/_Angleščina"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoč/_Priročnik/_Japonščina"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Angleščina"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Nemščina"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/Š_panščina"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Francoščina"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Italijanščina"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Pomoč/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr ""
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr ""
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Ustvarjam glavno okno...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Brez naslova"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "nič"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Izprazni smetnjak"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Dodaj poštni predal"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -4133,16 +4163,16 @@ msgstr ""
 "Če je določen obstoječi poštni predal,\n"
 "bo pregledan samodejno."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4151,104 +4181,104 @@ msgstr ""
 "Izdelava poštnega predala ni uspela.\n"
 "Morda obstajajo nekatere datoteke ali pa tam nimate dovoljenja za pisanje."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Syčpheed - ogled mape"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Ikone"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 #, fuzzy
 msgid "_Text"
 msgstr "Besedilo"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 #, fuzzy
 msgid "_None"
 msgstr "Nič"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Ali naj končam ta program?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Izberi mapo"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 #, fuzzy
 msgid "Command line options"
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uporaba: %s [MOŽNOST]...\n"
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4267,7 +4297,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4286,15 +4316,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4542,245 +4572,245 @@ msgstr "Datoteka"
 msgid "Description: "
 msgstr "Opis"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Odpiram okno za nastavitve računa...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Račun%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Nastavitve novega računa"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Nastavitve računa"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Ustvarjam okno za nastavitve računa...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Sprejmi"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Pošlji"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Sestavi"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Zasebnost"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Ime tega računa"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Nastavi kot privzeto"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Osebni podatki"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Polno ime"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Poštni naslov"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organizacija"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Podatki o strežniku"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Novice (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Noben (lokalen)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Ta strežnik zahteva overovitev"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Novičarski strežnik"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Strežnik za sprejemanje"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Strežnik SMTP (pošiljanje)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Uporabniško ime"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Geslo"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 #, fuzzy
 msgid "Use secure authentication (APOP)"
 msgstr "Ta strežnik zahteva overovitev"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Ob sprejemu odstrani sporočila s strežnika"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Odstrani po"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "dneh"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dnevih: odstrani nemudoma)"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Naloži vsa sporočila na strežniku"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Omejitev dolžine pri sprejemanju"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr ""
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtriranje sporočil ob sprejemu"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Privzeta mapa za prejeto pošto"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(Nefiltrirana sporočila bodo shranjena v tej mapi)"
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Overovitvena metoda"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtriranje sporočil ob sprejemu"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Novice"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "Največje število člankov za nalaganje\n"
 "(neomejeno, če podate 0)"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "Naslovnik ni določen."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Poberi vsa' preveri novo pošto na tem računu"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Zaglavje"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Dodaj polje z datumom v zaglavje"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Generiran ID sporočila"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Dodaj uporabniško definirano zaglavje"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Uredi... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Overovitev"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Avtentikacija SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 #, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
@@ -4789,251 +4819,255 @@ msgstr ""
 "Če pustite te vnose prazne, bosta uporabljena\n"
 "isti uporabnški ID in geslo kot pri sprejemu."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Pred pošiljanjem avtenticiraj s POP3"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Ime:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 #, fuzzy
 msgid "Command output"
 msgstr "Ukaz"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Samodejno nastavi sledeče naslove"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Kp:"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Skp:"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Odgovor za"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Privzeto podpiši sporočilo"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "privzeto zakodiraj sporočio"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Uporabi oklopljen zapis ASCII za enkripcijo"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Uporabi jasen tekstovni podpis"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Uporabi privzet ključ GnuPG"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Izberi ključ glede na vaš el. naslov"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Ročno določi ključ"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Uporabnik ali ID ključa"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Ne uporabljaj SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Uporabi SSL za povezavo POP3"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Uporabi ukaz STARTTLS za pričetek seje SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Uporabi SSL za povezavo IMAP4"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Uporabi SSL za povezavo NNTP"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Pošlji (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Uporabi SSL za povezavo SMTP"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 #, fuzzy
 msgid "Hostname:"
 msgstr "Ime gostitelja"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 #, fuzzy
 msgid "Port:"
 msgstr "Vrata"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 #, fuzzy
 msgid "Use authentication"
 msgstr "Overovitev"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Ime:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 #, fuzzy
 msgid "Password:"
 msgstr "Geslo"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 #, fuzzy
 msgid "Use SOCKS proxy on sending"
 msgstr "Uporabi zunanji program za pošiljanje"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Vnesite vrata SMTP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Vnesite vrata POP3"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Vnesite vrata IMAP4"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Vnesite vrata NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Vnesite ime domene"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Imenik strežnika IMAP"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Naloži vsa sporočila na strežniku"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Postavi poslana sporočila v"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Postavi osnutke sporočil v"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Postavi izbrisana sporočila v"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Postavi izbrisana sporočila v"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Ime računa ni vnešeno."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Elektronski naslov ni naveden."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Strežnik SMTP ni naveden."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Uporabnikov ID ni vnešen."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Strežnik POP3 ni vnešen."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Strežnik IMAP4 ni naveden."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Strežnik NNTP ni naveden."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/sr.po b/po/sr.po
index 038e5714..0445038b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2013-03-29 08:25+0100\n"
 "Last-Translator: Саша Петровић <salepetronije@gmail.com>\n"
 "Language-Team: српски <>\n"
@@ -29,202 +29,207 @@ msgstr "Пропусник за одбацивање поште (ручно)"
 msgid "Junk mail filter"
 msgstr "Пропусник за одбачену пошту"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Изгубљена Имап4 веза са налогом %s. Поново се повезујем...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "ИМАП4 служитељ је онемогућио ПРИЈАВУ.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "Нисам успео да успоставим везу ИМАП везу.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "стварам ИМАП4 везу са %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Нисам успео да покренем ТЛС сесију.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "Примам поруку %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Настављам поруке на %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Премештам поруке %s у %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Умножавам поруке %s у %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Уклањам поруке %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "нисам успео да обришем заставице: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "нисам успео да избришем\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Уклањам све поруке из %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "нисам успео да обришем ознаке: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "нисам успео да затворим фасциклу\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "не постоји родитељска фасцикла %s\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "јавила се грешка приликом добављања СПИСКА.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Нисам успео да направим „%s“\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Нисам успео да направим „%s“ у ПРИЈЕМУ\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "нисам успео да направим сандуче за пошту: СПИСАК није успео\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "нисам успео да направим сандуче за пошту\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "нисам успео да направим сандуче за пошту\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "нисам успео да преименујем поштанско сандуче: %s у %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "нисам успео да избришем сандуче\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Примам заглавља порука (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "дошло је до грешке при добављању коверте.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "нисам успео да обрадим коверту: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "нисам успео да добавим коверту\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Нисам успео да се повежем са ИМАП4 служитељем: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Нисам успео да успоставим ИМАП4 везу са: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "нисам успео да добијем адресни наставак\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "нисам успео да означим фасциклу: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "грешка имап наредбе: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "ИМАП4 пријава није успела.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Неуспешна ИМАП4 пријава.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "нисам успео да додам %s на %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(слање датотеке...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не могу додати поруку на %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "нисам успео да умножим %s у %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "грешка приликом имап наредбе: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "десила се грешка при имап наредби: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "десила се грешка при имап наредби: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv није успео да претвори из УТФ-7 у %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv није успео да претвори из %s у УТФ-7\n"
@@ -498,7 +503,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "дошло је до грешке у ПОП3 сесији\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "нисам успео да упишем податке подешавања на диск\n"
@@ -550,50 +555,50 @@ msgstr "неисправан СМПТ одзив\n"
 msgid "error occurred on SMTP session\n"
 msgstr "дошло је до грешке у СМТП сесији\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "ССЛв23 није доступан\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "ССЛв23 није доступан\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "ТЛСв1 није доступан\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "ТЛСв1 није доступан\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "ССЛ начин није доступан\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Непознати ССЛ начин *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Грешка прављења ссл контекста\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "ССЛ веза уз коришћење %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Уверење служитеља:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Предмет: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Издавач: %s\n"
@@ -652,7 +657,7 @@ msgstr ""
 "нисте, пишите на адресу: „Free Software Foundation, Inc., 59 Temple Place - "
 "Suite 330, Boston, MA 02111-1307, USA“."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -689,14 +694,14 @@ msgstr ""
 "на Г ступцу да би омогућили пријем порука са „преузми све“."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Име"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -824,13 +829,13 @@ msgstr "Корисничка тврдња радње"
 msgid "Add Address to Book"
 msgstr "Додај адресу у именик"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Адреса"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Примедбе"
 
@@ -842,7 +847,7 @@ msgstr "Изабери фасциклу за именик"
 msgid "Auto-registered address"
 msgstr "Самостално сачуване адресе"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Датотека"
@@ -863,10 +868,10 @@ msgstr "/_Датотека/Нови _Јпилот"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Датотека/Нови _ЛДАП служитељ"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Датотека/---"
@@ -883,21 +888,21 @@ msgstr "/_Датотека/_Избриши"
 msgid "/_File/_Save"
 msgstr "/_Датотека/_Сачувај"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Датотека/_Затвори"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Уреди"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Датотека/_Умножи"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Уреди/_Налепи"
 
@@ -941,7 +946,7 @@ msgstr "/_Адреса/_Уреди"
 msgid "/_Address/_Delete"
 msgstr "/_Адреса/_Избриши"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Алати"
@@ -954,12 +959,12 @@ msgstr "/_Алати/_Увези _ЛДИФ датотеку"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Алати/_Увези _ЦСВ датотеку"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Помоћ"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Помоћ/О про_граму"
@@ -977,7 +982,7 @@ msgid "/New _Folder"
 msgstr "/Нова _фасцикла"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1019,7 +1024,7 @@ msgstr "Именик"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Фасцикла"
 
@@ -1031,17 +1036,17 @@ msgstr "Адреса е-поште"
 msgid "Search:"
 msgstr "Тражи:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "За:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Умножак:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Поверљиви умножак:"
@@ -1250,7 +1255,7 @@ msgstr "Адреса обична"
 msgid "Personal address"
 msgstr "Лична адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Напомена"
 
@@ -1306,392 +1311,397 @@ msgstr "Смеђа"
 msgid "None"
 msgstr "Ништа"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Отвори"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Додај..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Уклони"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Особине..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Датотека/_Пошаљи"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Датотека/_Пошаљи _касније"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Датотека/Сачувај у фасцикли _нацрта"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Датотека/Сачувај датотеку и _настави уређивање"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Датотека/_Приложи датотеку"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Датотека/_Убаци датотеку"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Датотека/Уметни _потпис"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Датотека/_Додај потпис у наставку"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Уреди/_Опозови"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Уреди/_Понови"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Уреди/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Уреди/_Исеци"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Уреди/Убаци као _навод"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Уреди/Изабери _све"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Уреди/_Преломи садашњи параграф"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Уреди/Преломи све дуге _линије"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Уреди/Самостално _преламање текста"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Преглед"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Преглед/_према"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Преглед/_Умножак"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Преглед/_Поверљивог умношка"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/_Преглед/_Одговори"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Преглед/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/_Преглед/_Прати до"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Преглед/Ле_њир"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Преглед/_Прилог"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Преглед/_Подеси траку алата..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Преглед/_Кодирање знакова"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Преглед/_Кодирање знакова/_самостално"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Преглед/_Кодирање знакова/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Преглед/_Кодирање знакова/7-битни асции (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Преглед/_Кодирање знакова/Уникод (_УТФ-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Преглед/_Кодирање знакова/западноноевропски (ISO-8859-1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Преглед/_Кодирање знакова/западноевропски (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Преглед/_Кодирање знакова/_средњеевропски (ISO-8859-2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Преглед/_Кодирање знакова/_блатнички (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Преглед/_Кодирање знакова/блатнички (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Преглед/_Кодирање знакова/_блатички (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Преглед/_Кодирање знакова/грчки (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Преглед/_Кодирање знакова/арапски (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Преглед/_Кодирање знакова/_арапски (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Преглед/_Кодирање знакова/__визуелни хебрејски (ISO-8859-8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Преглед/_Кодирање знакова/_хебрејски (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Преглед/_Кодирање знакова/турски (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Преглед/_Кодирање знакова/ћирилица (ISO-8859-5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Преглед/_Кодирање знакова/ћирилица (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Преглед/_Кодирање знакова/ћирилица (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Преглед/_Кодирање знакова/Ћирилица (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Преглед/_Кодирање знакова/јапански (ISO-2022-JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Преглед/_Кодирање знакова/_поједностављени кинески (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Преглед/_Кодирање знакова/поједностављени кинески (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Преглед/_Кодирање знакова/традиционални кинески (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Преглед/_Кодирање знакова/корејски (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Преглед/_Кодирање знакова/таиландски (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Преглед/_Кодирање знакова/Тјаландски (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Алати/_Именик"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Алати/_Образац"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Алати//Радњ_е"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Алати/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Алати/Користи _спољни програм за уређивање"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/_Алати/Не приказуј _обавештења"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Алати/ПГП _потпис"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Алати/ПГП _шифровање"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Алати/_Провера писања"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Алати/_Језик за правопис"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: датотека не постоји\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Нисам успео да добавим део поруке\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Грешка облика ознаке навода."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Грешка одговора на поруку/прослеђивање."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Датотека %s не постоји\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не могу да одредим величину %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Датотека %s је празна."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Нисам успео да прочитам %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Порука: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Нисам успео да добавим поруку из више делова."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Без предмета)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Састављање%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Потпис"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Нема наведених примаоца."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Празан предмет"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Предмет је празан. Да га пошаљем свеједно?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Недостаје прилог"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Нема прилога. Да ли желите послати поруку без прилога?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Провери примаоце"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Да заиста пошаљем поруку следећој адреси?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Од:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Предмет:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "_Пошаљи"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
@@ -1699,11 +1709,11 @@ msgstr ""
 "У току је провера за новим порукама.\n"
 "Молим, покушајте поново касније."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "нисам успео добавити списак примаоца."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1711,40 +1721,40 @@ msgstr ""
 "Налог за слање поруке није наведен.\n"
 "Молим, изаберите налог е-поште пре слања."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Јавила се грешка при покушају слања поруке ка %s ."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 "Слање поруке је успело, али, нисам успео да сачувам поруку у одлазно сандуче."
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Нисам успео наћи везу кључа са тренутно одређеним лб кључа `%s'."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "Нисам успео да потпишем поруку."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "Нисам успео да шифрујем поруку."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "Нисам успео да шифрујем или потпишем поруку."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "нисам успео да променим особине датотеке\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1755,11 +1765,11 @@ msgstr ""
 "\n"
 "Да ли да је пошаљем као %s?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Грешка приликом превођења кодовања"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1772,15 +1782,15 @@ msgstr ""
 "\n"
 "Да је пошаљем и упркос томе?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Ограничење дужину натписа"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Шифруј поверљивим умношком"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1794,94 +1804,104 @@ msgstr ""
 "\n"
 "Да ли је послати упркос томе?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "нисам успео да уклоним стару поруку\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "заказујем поруку...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "нисам успео да пронађем фасциклу заказаног\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "нисам успео да закажем поруку\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Датотека %s не постоји."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Нисам успео да отворим датотеку %s."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Стварам прозор за уређивање...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Знак ПГП"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "ПГП шифровање"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Врста податка"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Величина"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Потпис"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Провера потписа"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Неисправна MIME врста."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Датотека не постоји или је празна."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Особине"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "МИМЕ врста"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Кодирање"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путања"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Назив датотеке"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "Датотека не постоји."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Отварање извршне датотеке"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1893,12 +1913,12 @@ msgstr ""
 "Ако је желите покренути, сачувајте је негде и проверите да ли има вирус или "
 "нешто налик штетном програму."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Наредбена линија спољњег уређивача није исправна: „%s“\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1907,48 +1927,48 @@ msgstr ""
 "Спољњи уређивач још увек ради.\n"
 "Приморај процес на затварање (плб: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "_Прилагоди траку алата..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Нисам успео да закажем поруку."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Означи датотеке"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Означи датотеку"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Сачувај поруку"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ова порука је измењена. Да ли да је сачувам у фасциклу нацрта?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Затвори _без чувања"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Да ли желите да примените образац „%s“ ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Примените образац"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Замени"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Убаци"
 
@@ -1989,7 +2009,7 @@ msgid "Nick Name"
 msgstr "Надимак"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Адреса е-поште"
 
@@ -2047,7 +2067,7 @@ msgid " Check File "
 msgstr " Провери датотеку "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Датотека"
 
@@ -2055,62 +2075,62 @@ msgstr "Датотека"
 msgid "Add New Address Book"
 msgstr "Додај нови именик"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Име групе обавезно приложити."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Уредите групне податке"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Назив скупа"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Доступне адресе"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Адреса у скупу"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Премести адресе у или из скупова дугмићима са стрелицама"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Уредите појединости скупа"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Додај нови скуп"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Уреди фасциклу"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Унесите нови назив фасцикле:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Нова фасцикла"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Унесите нови назив фасцикле:"
 
@@ -2127,7 +2147,7 @@ msgid "Edit JPilot Entry"
 msgstr "Уреди ставку ЈПилота"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2192,7 +2212,7 @@ msgstr "Време истека (секунди)"
 msgid "Maximum Entries"
 msgstr "Највише уноса"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Основно"
 
@@ -2279,7 +2299,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Изабери..."
 
@@ -2461,12 +2481,12 @@ msgstr "Подешавам податке фасцикле...\n"
 msgid "Setting folder info..."
 msgstr "Подешавање података фасцикле..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Прегледам фасциклу %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Прегледам фасциклу %s ..."
@@ -3279,682 +3299,692 @@ msgstr ""
 "Пронађено је претходно издање поставки.\n"
 "Да ли га желите пренети?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Датотека/_Фасцикла"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Датотека/_Фасцикла/Направи _нову фасциклу..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Датотека/_Фасцикла/_Преименуј фасциклу..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Датотека/_Фасцикла/_Премести фасциклу..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Датотека/_Фасцикла/_Бриши фасциклу"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Датотека/_Сандуче"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Датотека/_Фасцикла/Додај _сандуче..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Датотека/_Фасцикла/_Уклони сандуче"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Датотека/_Сандуче/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Датотека/_Сандуче/_Провери нове поруке"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Датотека/_Сандуче/Провери нове порукама у _свим сандучадима"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Датотека/_Сандуче/П_оново изгради дрво фасцикли"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_Датотека/_Увези податке поште..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_Датотека/_Извези податке поште..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Датотека/Испразни сво _смеће"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Датотека/_Сачувај као..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Датотека/Поста_вке стране..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Датотека/_Штампај..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Датотека/_Рад ван мреже"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Датотека/И_злаз"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Уреди/Изабери _тему"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Уреди/_Нађи у текућој поруци..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Уреди/_Тражи поруке..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/_Уреди/_Брза претрага"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Преглед/Прикажи или _сакриј"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Преглед/Прикажи или _сакриј/_Дрво фасцикли"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Преглед/Прикажи или _сакриј/_Преглед порука"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Преглед/Прикажи или _сакриј/_Траку алата"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Преглед/Прикажи или _сакриј/_Траку алата/Иконе и текст"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Преглед/Прикажи или сакриј_/_Траку алата/Текст десно од иконе"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Преглед/Прикажи или _сакриј/_Траку алата/_Икону"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Преглед/Прикажи или _сакриј/_Траку алата/_Текст"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Преглед/Прикажи или _сакриј/_Траку алата/_Ништа"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Преглед/Прикажи или _сакриј/_Траку претраге"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Преглед/Прикажи или сакриј/_Траку стања"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Преглед/_Подеси траку алата..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/_Преглед/Распоре_д"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Преглед/Распоре_д/_Уобичајен"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/_Преглед/Распоре_д/_Усправан"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Преглед/Раздвој д_рво фасцикли"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Преглед/Раздвојен преглед _порука"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Преглед/_Развстај"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Преглед/_Разврстај/по _броју"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Преглед/_Разврстај/према в_еличини"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Преглед/_Разврстај/по _датуму"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Преглед/_Разврстај/по датуму т_еме"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Преглед/_Разврстај/по _пореклу"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Преглед/_Разврстај/по _примаоцу"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Преглед/_Разврстај/по _предмету"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Преглед/_Разврстај/по _боји обележја"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Преглед/_Разврстај/по _белегу"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Преглед/_Разврстај/по _непрочитаним"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Преглед/_Разврстај/по п_рикључку"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Преглед/_Разврстај/Не_мој да разврставаш"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Преглед/_Разврстај/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Преглед/_Разврстај/силазно"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Преглед/_Разврстај/узлазно"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Преглед/_Разврстај/_Скупи по предмету"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Преглед/_Преглед теме"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Преглед/_Прошири све теме"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Преглед/_Скупи све теме"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Преглед/Постави _ставке за приказ..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Преглед/_Иди на"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Преглед/_Иди на/_претходну поруку"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Преглед/_Иди на/_следећу поруку"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Преглед/_Иди на/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Преглед/_Иди на/пре_тходну непрочитану поруку"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Преглед/_Иди на/следећу непрочитану поруку"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Преглед/_Иди на/претходну н_ову поруку"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Преглед/_Иди на/сл_едећу нову поруку"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Преглед/_Иди на/претходну _обележену поруку"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Преглед/_Иди на/следећу _обележену поруку"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Преглед/_Иди на/претходну _обележену поруку"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Преглед/_Иди на/следећу _обележену поруку"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Преглед/_Иди на/Другу фасциклу..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Преглед/_Кодирање знакова/_Самостално препознај"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Преглед/_Кодирање знакова/_западноноевропски (Прозори-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Преглед/_Кодирање знакова/Јапански (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Преглед/_Кодирање знакова/Јапански (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Преглед/_Кодирање знакова/Јапански (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Преглед/_Кодирање знакова/Обичајни кинески (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Преглед/_Кодирање знакова/Кинески (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Преглед/_Кодирање знакова/Јапански (ISO-2022-JP)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Преглед/Отвори у новом _прозору"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Преглед/Изворни код п_оруке"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/_Преглед/Сва _заглавља"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Преглед/_Освежи сажетак"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Порука"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_Порука/Прим_и"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Порука/Прим_и/Добави са свих _садашњих налога"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Порука/Прим_и/Добави са _свих налога"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Порука/Прим_и/Заустави прије_м"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Порука/Прим_и/_Удаљено сандуче..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Порука/Прим_и/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Порука/_Пошаљи заказану поруку"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Порука/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Порука/Саставите _нову поруку"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Порука/_Одговори"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Порука/Одгово_ри"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Порука/Одгово_ри/_свима"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Порука/Одгово_ри/_пошиљаоцу"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Порука/Одгово_ри/на дописну листу"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Порука/_Проследи"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Порука/_Проследи као прилог"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Порука/_Преусмер_и"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Порука/Пре_мести..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Порука/_Умножи..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Порука/_Обележи"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Порука/_Обележи/Постави _заставицу"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Порука/_Обележи/_Уклони _заставицу"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Порука/_Обележи/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Порука/_Обележи/Означи као непрочитано"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Порука/_Обележи/Означи као прочитану"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Порука/_Обележи/Означи да је _тема прочитана"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Порука/_Обележи/Означи све као _прочитано"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Порука/_Обриши"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Порука/Означи поруку као _отпад"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Порука/Означи поруку да није _отпад"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Порука/Поново _уреди"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Алати/Додај примаоца у имени_к..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Алати/_Разврстај све поруке у фасцикли"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Алати/Разврстај _означене поруке"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Алати/_Направи правило за разврставање"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Алати/Направи правило за разврставање/_самостално"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Алати/_Направите правило за разврставање_/по _пошиљаоцу"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Алати/_Направите правило за разврставање/по _примаоцима"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Алати/_Направите правило за разврставање/по _предмету"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Алати/Пронађи _отпадне поруке из фасцикле"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Алати/Пронађи међу означеним порукама отпад"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Алати/Обриши _двоструке поруке"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Алати/П_овежи раздвојене поруке"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Алати/И_зврши означену радњу"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Алати/Пронађи _отпадне поруке из фасцикле"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Алати/_Разврстај све поруке у фасцикли"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Алати/Прозор _дневника"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Поставке"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Поставке/_Уобичајене поставке..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Поставке/_Поставке услова..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Поставке/_Образац..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Поставке/_Радње..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Поставке/_Управник прикључака..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Поставке/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Поставке/_Својства тренутног налога..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Поставке/Направи _нови налог..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Поставке/_Уреди налоге..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Поставке/И_змени текући налог"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Помоћ/_Упутство"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Помоћ/_Упутство/_Енглески"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Помоћ/_Упутство/_Јапански"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Помоћ/_ЧПП"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Помоћ/_ЧПП/_Енглески"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Помоћ/_ЧПП/_Немачки"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Помоћ/_Упутство/_Шпански"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Помоћ/_Упутство/_Француски"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Помоћ/_Упутство/_Италијански"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Помоћ/_Могућности наредбене линије"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Помоћ/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/_Помоћ/Провера _надоградње..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/_Помоћ/Провера надоградње _прикључака..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Образујем главни прозор...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главни прозор: Премештање боје %d није успело\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Неименовано"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "никакво"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Ван мреже"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Рад ван мреже. Да ли да се повежем?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Испразни све корпе"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Избаци све поруке из фасцикла корпе?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Додај нову фасциклу поште"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3964,16 +3994,16 @@ msgstr ""
 "Ако је наведено постојеће сандуче, биће\n"
 "самостално прегледано."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Сандуче „%s“ већ постоји."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Подешавање поште"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3982,95 +4012,95 @@ msgstr ""
 "Нисам успео да створим сандуче поште.\n"
 "Можда неке датотеке већ постоје, или немате дозволе за упис на том месту."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Силфид - Преглед фасцикле"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Силфид - Преглед поруке"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Одговори"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Одговори _свима"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Одговори _пошиљаоцу"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Одговори дописном _списку"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Проследи"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Про_следи као прикључак"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Пре_усмери"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Иконице _и текст"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Текст са _десне стране иконе"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "_Икона"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_Текст"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_Ништа"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Рад ван мреже. Кликните на икону за рад на мрежи."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Рад на мрежи. Кликните на икону за рад ван мреже."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Излаз"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Затворити овај програм?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "Одабрана датотека не може бити удружена."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Изаберите фасциклу за отварање"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Могућности наредбене линије"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Употреба: sylpheed [МОГУЋНОСТ]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4089,7 +4119,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4123,15 +4153,15 @@ msgstr ""
 "приказује ову помоћ и излази\n"
 "приказује податке о издању и излази"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Могућности само за Прозоре:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "одредите прикључник за ИПЦ удаљене наредбе"
 
@@ -4365,236 +4395,236 @@ msgstr "Датотека:"
 msgid "Description: "
 msgstr "Опис: "
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Отварам прозор за уређивање налога...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Налог%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Поставке новог налога"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Поставке налога"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Стварам прозор за уређивање налога...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Прими"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Пошаљи"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Састављање"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Приватност"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "ССЛ"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Посредник"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Напредно"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Назив овог налога"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Постави као подразумевани"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Лични подаци"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Пуно име"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Адреса поште"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Удружење"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Подаци о служитељу"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "ПОП3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "ИМАП4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Вести (ННТП)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Ништа (месно)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Овај служитељ захтева пријаву"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Служитељ вестима"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Служитељ од кога се преузима"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "СМПТ служитељ (слање)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "ЛБ корисника"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Лозинка"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Користи безбедну пријаву (АПОП)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Уклони поруке код служитеља по пријему"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Уклони након"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "дана"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 дана: уклони одмах"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Преузми све поруке (укључујући већ примљене) код служитеља"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Прими ограничење величине"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Распоређуј поруке при пријему"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Подразумевано пријемно сандуче"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Нераспоређене поруке ће бити чуване у овој фасцикли."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Начин пријаве"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Самостално"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "При пријему само провери пријемно сандуче"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "При пријему распоређуј нове поруке у пријемно сандуче"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Вести"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Највећи број чланака за преузимање"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Нема ограничења ако је одређена 0."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "„Преузми све“ проверава нове поруке за овај налог"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Заглавље"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Додај поље у заглављу за датум"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Образује ЛБ поруке"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Додаје кориснички одређено заглавље"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Уреди..."
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Пријава"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "СМПТ пријава (СМПТ АУТХ)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4602,241 +4632,245 @@ msgstr ""
 "Ако желите да оставите ове уносе празним, исти кориснички ЛБ и лозинка за "
 "пријем ће бити коришћени."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Пријава са ПОП3 пре слања"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Потпис"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Непосредан унос"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Назив:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Излаз извршења наредбе"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Постави потпис пре навода (није препоручиво)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Самостално постави следеће адресе"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Умножак"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Поверљиви умножак"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Одговори"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "ПГП потписивање порука као подразумевано"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "Шифруј поруку помоћу ПГП-а подразумевано"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Шифруј при одговору на шифровану поруку"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "нисам успео добавити списак примаоца."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Користи АСЦИИ-оклопљени облик уа шифровање"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Користи потпис састављен од чистог текста"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Користи задати ГнуПГ потписни кључ"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Одреди кључ по адреси поште"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Ручно одреди кључ"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Корисник или ЛБ кључ:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Не користи ССЛ"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Користи ССЛ за ПОП3 везу"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Користи СТАРТСЛ наредбу за покретање ССЛ сесије"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Користи ССЛ за ИМАП4 везу"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "ННТП"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Користи ССЛ за ННТП везу"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Пошаљи (СМПТ)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Користи ССЛ за СМПТ везу"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Користи неблокирајући ССЛ"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Искључите ово ако имате потешкоћа са ССЛ везом."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "Користи СОКС прикључника"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Име домаћина:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Прикључник:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Користи пријаву"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Назив:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Користи СОКС посредника при слању"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Одреди СМТП прикључник"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Одредите ПОП3 прикључник"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Одреди ИМАП4 прикључник"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Одреди ННТП прикључник"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Одреди називе домаћина"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Фасцикла ИМАП служитеља"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Само подфасцикле ове фасцикле ће бити приказане."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Очисти сву прихватну меморију при излазу"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Смести послате поруке у"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Смести поруке нацрта у"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Смести заказане поруке у"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Смести обрисане поруке у"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Није унесен назив налога."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Нисте унели адресу поште."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Нисте навели СМПТ служитеља."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Кориснички ЛБ није унесен."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Нисте навели ПОП3 служитеља."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Нисте навели ИМАП4 служитеља."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Нисте навели ННТП служитеља."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Фасцикла коју сте означили није фасцикла заказане поште."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/sv.po b/po/sv.po
index 8192da0b..680c215a 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: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -29,203 +29,208 @@ msgstr "Skräppostfilter"
 msgid "Junk mail filter"
 msgstr "Skräppostfilter"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-förbindelse till %s har avbrutits. Återuppkopplar...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP-server stänger av LOGIN.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 #, fuzzy
 msgid "Could not establish IMAP connection.\n"
 msgstr "Kan inte skapa IMAP4-session med: %s:%d\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "skapar IMAP4-förbindelse till %s:%d...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Kan inte starta TLS-session.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, fuzzy, c-format
 msgid "Getting message %u"
 msgstr "Hämtar meddelande %d"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Lägger till meddelande till %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Flyttar meddelande %s till %s..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopierar meddelanden %s till %s..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Tar bort meddelanden %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan inte sätta borttaget-flaggor: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "kan inte utplåna\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Tar bort alla meddelanden i %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan inte sätta borttaget-flaggor: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "kan inte stänga mapp\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "rotmapp %s finns inte\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "fel uppstod vid hämtning av LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kan inte skapa \"%s\"\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan inte skapa \"%s\" under INBOX\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan inte skapa brevlåda: LIST misslyckades\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "kan inte skapa brevlåda\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan inte byta namn på brevlåda %s till %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "kan inte ta bort brevlåda\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Hämtar meddelandehuvuden (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "fel uppstod vid hämtning av kuvert.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan inte tolka kuvert: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "kan inte hämta kuvert\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan inte ansluta till IMAP4-server: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kan inte skapa IMAP4-session med: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "kan inte hämta namnutrymme\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan inte välja mapp: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "fel vid imapkommando: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-autentisering misslyckades.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-inloggning misslyckades.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan inte lägga till %s till %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(skickar fil...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kan inte lägga till meddelande till %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan inte kopiera %s till %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fel vid imapkommando: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fel vid imapkommando: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "fel vid imapkommando: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan inte konvertera UTF-7 till %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan inte konvertera %s till UTF-7\n"
@@ -502,7 +507,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "fel uppstod vid POP3-session\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "misslyckades skriva konfiguration till fil\n"
@@ -554,50 +559,50 @@ msgstr "felaktigt SMTP-svar\n"
 msgid "error occurred on SMTP session\n"
 msgstr "fel uppstod vid SMTP-session\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 ej tillgängligt\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 tillgängligt\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 ej tillgängligt\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 tillgängligt\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "SSL-metod ej tillgänglig\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Okänd SSL-metod *PROGRAMFEL*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Fel vid skapande av SSL-kontext\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL-anslutning med %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Servercertifikat:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Ärende:  %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Utfärdare: %s\n"
@@ -657,7 +662,7 @@ msgstr ""
 "program. Om inte, skriv till Free Software Foundation, Inc., 59 Temple Place "
 "- Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -697,14 +702,14 @@ msgstr ""
 "via \"Hämta alla\""
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Namn"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -832,13 +837,13 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Adress"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Kommentarer"
 
@@ -851,7 +856,7 @@ msgstr "Välj adressboksmapp"
 msgid "Auto-registered address"
 msgstr "Registrerade mallar"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Arkiv"
@@ -873,10 +878,10 @@ msgstr "/_Arkiv/Ny _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
@@ -893,21 +898,21 @@ msgstr "/_Arkiv/_Ta bort"
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Redigera"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
@@ -954,7 +959,7 @@ msgstr "/A_dress/_Redigera"
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/V_erktyg"
@@ -968,12 +973,12 @@ msgstr "/V_erktyg/Importera _LDIF-fil"
 msgid "/_Tools/Import _CSV file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
@@ -991,7 +996,7 @@ msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1035,7 +1040,7 @@ msgstr "Adressbok"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Mapp"
 
@@ -1048,17 +1053,17 @@ msgstr "E-postadress"
 msgid "Search:"
 msgstr "Sök"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Till:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Dold kopia:"
@@ -1266,7 +1271,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Notera"
 
@@ -1322,415 +1327,420 @@ msgstr "Brun"
 msgid "None"
 msgstr "Ingen"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Öppna"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Lägg till..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Ta bort"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Egenskaper..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Arkiv/_Skicka"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Arkiv/S_kicka senare"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Arkiv/Spara i _utkast-mappen"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Arkiv/Spara och _fortsätt redigera"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Arkiv/_Bifoga fil"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Arkiv/_Infoga fil"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Arkiv/Infoga si_gnatur"
 
-#: src/compose.c:593
+#: src/compose.c:598
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/_Arkiv/Infoga si_gnatur"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Redigera/_Ångra"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Redigera/Gör _om"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Redigera/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Redigera/Klipp _ut"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigera/Klistra in som _citat"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Redigera/Markera _allt"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Redigera/Bryt rader i _stycke"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Redigera/Bryt _långa rader"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigera/Automatisk _radbrytning"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Visa"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Visa/_Till"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Visa/_Kopia"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Visa/_Dold kopia"
 
-#: src/compose.c:617
+#: src/compose.c:622
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Visa/_Svara till"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Visa/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Visa/_Följ upp till"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Visa/_Linjal"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Visa/_Bilagor"
 
-#: src/compose.c:625
+#: src/compose.c:630
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Visa/_Teckenkodning"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Visa/_Teckenkodning/_Automatisk"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visa/_Teckenkodning/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visa/_Teckenkodning/7 bitars ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visa/_Teckenkodning/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visa/_Teckenkodning/Västeuropeisk (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visa/_Teckenkodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visa/_Teckenkodning/Centraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visa/_Teckenkodning/_Baltisk (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visa/_Teckenkodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visa/_Teckenkodning/Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Visa/_Teckenkodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visa/_Teckenkodning/Hebreisk (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visa/_Teckenkodning/Hebreisk (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visa/_Teckenkodning/Turkisk (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (KOI8-_U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visa/_Teckenkodning/Japansk (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visa/_Teckenkodning/Förenklad kinesisk (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visa/_Teckenkodning/Förenklad kinesisk (_GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visa/_Teckenkodning/Traditionell kinesisk (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visa/_Teckenkodning/Koreansk (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visa/_Teckenkodning/Thai (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visa/_Teckenkodning/Thai (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/V_erktyg/_Adressbok"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/V_erktyg/_Åtgärder"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/V_erktyg/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/V_erktyg/Redigera med e_xtern redigerare"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/V_erktyg/_Signera"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/V_erktyg/_Kryptera"
 
-#: src/compose.c:733
+#: src/compose.c:738
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/V_erktyg/Utför _köade åtgärder"
 
-#: src/compose.c:734
+#: src/compose.c:739
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Kan inte läsa textdel\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte läsa %s"
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Skriv%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Signatur"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Tomt ämne"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Bilagor"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 #, fuzzy
 msgid "_Send"
 msgstr "Skicka"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Letar efter nya meddelanden i alla mappar..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1738,43 +1748,43 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, 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:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1785,11 +1795,11 @@ msgstr ""
 "\n"
 "Skicka det som %s ändå?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av kod"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1802,15 +1812,15 @@ msgstr ""
 "\n"
 "Sänd det ändå?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1819,96 +1829,106 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Kan inte öppna markeringsfil.\n"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Datum"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Signatur"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Undersöker signatur"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: filen finns inte\n"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Öppnande av körbar fil"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1920,12 +1940,12 @@ msgstr ""
 "Om du vil köra den, spara den någonstans och kolla att det inte är ett virus "
 "eller något illasinnat program."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1935,48 +1955,48 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -2017,7 +2037,7 @@ msgid "Nick Name"
 msgstr "Smeknamn"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-postadress"
 
@@ -2076,7 +2096,7 @@ msgid " Check File "
 msgstr " Kontrollera fil "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Fil"
 
@@ -2085,62 +2105,62 @@ msgstr "Fil"
 msgid "Add New Address Book"
 msgstr "Lägg till ny adressbok"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Ett gruppnamn måste anges."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Redigera gruppdata"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Gruppnamn"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Tillgängliga adresser"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Adresser i grupp"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Flytta e-postadresser till eller från grupp med pilknapparna"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Redigera gruppdetaljer"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Lägg till ny grupp"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Redigera mapp"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet på mappen:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -2157,7 +2177,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigera JPilot-post"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2222,7 +2242,7 @@ msgstr "Väntetid (sek)"
 msgid "Maximum Entries"
 msgstr "Maximalt antal poster"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Grundläggande"
 
@@ -2314,7 +2334,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Välj... "
 
@@ -2506,12 +2526,12 @@ msgstr "Ställer in mappinfo...\n"
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
@@ -3362,703 +3382,713 @@ msgstr ""
 "Den tidigare versionen av konfigurationen hittad.\n"
 "Vill du flytta den?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Arkiv/_Mapp"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Arkiv/_Mapp/_Ny mapp..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Arkiv/_Mapp/_Byt namn..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Arkiv/_Mapp/_Flytta..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Arkiv/_Mapp/_Ta bort"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Arkiv/_Brevlåda..."
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Arkiv/_Brevlåda/_Lägg till..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Arkiv/_Brevlåda/_Ta bort"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Arkiv/_Brevlåda/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Arkiv/_Brevlåda/Ta emot nya _meddelanden"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Arkiv/_Brevlåda/Ta emot nya meddelanden i _alla brevlådor"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Arkiv/_Brevlåda/_Uppdatera mappträd"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 #, fuzzy
 msgid "/_File/_Import mail data..."
 msgstr "/_Arkiv/_Importera mbox-fil..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_File/_Export mail data..."
 msgstr "/_Arkiv/_Exportera till mbox-fil..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Arkiv/Töm alla _papperskorgar"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Arkiv/_Spara som..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Arkiv/_Spara som..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Arkiv/Skriv _ut..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Arkiv/Arbeta _offline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Arkiv/_Avsluta"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Redigera/Välj _tråd"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redigera/Sök _i aktuellt meddelande..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Redigera/_Sök meddelanden..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 #, fuzzy
 msgid "/_Edit/_Quick search"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Visa/_Visa eller dölj"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Visa/_Visa eller dölj/_Mappträd"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Visa/_Visa eller dölj/Me_ddelandevy"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/Ikoner _och text"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Ikoner"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Ikoner"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Text"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/I_ngetdera"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Visa/_Visa eller dölj/_Statusrad"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visa/_Visa eller dölj/_Statusrad"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 #, fuzzy
 msgid "/_View/Layou_t"
 msgstr "/_Visa/_Sortera"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 #, fuzzy
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Visa/_Sortera/efter _från"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr ""
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visa/Separat ma_ppträd"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Visa/Separat m_eddelandevy"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Visa/_Sortera"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visa/_Sortera/efter _nummer"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Visa/_Sortera/efter stor_lek"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Visa/_Sortera/efter _datum"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Visa/_Sortera/efter _tråddatum"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Visa/_Sortera/efter _från"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Visa/_Sortera/efter _mottagare"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Visa/_Sortera/efter _ämne"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visa/_Sortera/efter fä_rgmarkering"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visa/_Sortera/efter mar_kering"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Visa/_Sortera/efter _oläst"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visa/_Sortera/efter _bilaga"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visa/_Sortera/_inte alls"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Visa/_Sortera/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Visa/_Sortera/Uppstigande"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Visa/_Sortera/Nedstigande"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visa/_Sortera/_Attrahera efter ärende"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Visa/_Trådvy"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visa/E_xpandera alla trådar"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visa/Ko_llapsa alla trådar"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Visa/_Poster i summeringsvyn..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Visa/_Gå till"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Visa/_Gå till/_Föreg. meddelande"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visa/_Gå till/_Nästa meddelande"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Visa/_Gå till/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Visa/_Gå till/F_öreg. olästa meddelande"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visa/_Gå till/N_ästa olästa meddelande"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Visa/_Gå till/Föreg. n_ya meddelande"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visa/_Gå till/Näs_ta nya meddelande"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Visa/_Gå till/Föreg. _markerade meddelande"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visa/_Gå till/Nästa m_arkerade meddelande"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Visa/_Gå till/Föreg. _färgade meddelande"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visa/_Gå till/Nästa fä_rgade meddelande"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visa/_Teckenkodning/_Automatisk igenkänning"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Visa/_Teckenkodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visa/_Teckenkodning/Japansk (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visa/_Teckenkodning/Japansk (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visa/_Teckenkodning/Japansk (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visa/_Teckenkodning/Traditionell kinesisk (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visa/_Teckenkodning/Kinesisk (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visa/_Teckenkodning/Koreansk (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Visa/_Öppna i nytt fönster"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Visa/_Meddelandekällkod"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Visa/_Hela brevhuvudet"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Meddelande"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelande/Mott_ag"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelande/Mottag/Hämta från _detta konto"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelande/Mottag/Hämta från alla _konton"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Meddelande/Mottag/Avbryt hämtnin_g"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Meddelande/Mottag/Hämta från alla _konton"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelande/Mottag/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelande/Skicka _köade meddelanden"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Meddelande/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelande/Skriv _nytt meddelande"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Meddelande/Sva_ra"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelande/_Svara till"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelande/_Svara till/a_lla"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelande/_Svara till/_avsändaren"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelande/_Svara till/_e-postlista"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Meddelande/Vi_darebefordra"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelande/Vidarebefordra som bil_aga"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelande/_Omdirigera"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelande/Fl_ytta..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelande/_Kopiera"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Meddelande/_Markera"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 #, fuzzy
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Meddelande/_Markera/_Markera"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Meddelande/_Markera/_Avmarkera"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelande/_Markera/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelande/_Markera/Markera som _oläst"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelande/_Markera/Markera som _läst"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Meddelande/_Markera/Markera som _läst"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelande/_Markera/Markera alla som l_ästa"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Meddelande/_Ta bort"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Meddelande/Sätt som _skräppost"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelande/Sätt som inte skr_äppost"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelande/Redigera _om"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/V_erktyg/Lägg till avsändaren i adressbo_k..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/V_erktyg/Filtrera _valda meddelanden"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/V_erktyg/_Skapa filterregel"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/V_erktyg/_Skapa filterregel/_Automatiskt"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Från"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Till"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Ämne"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/V_erktyg/Filtrera _skräppost i mappen"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/V_erktyg/Filtrera skräp_post i valda meddelanden"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/V_erktyg/Ta bort meddelande_dubbletter"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 #, fuzzy
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/V_erktyg/Ta bort meddelande_dubbletter"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Kör markerad process"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/V_erktyg/Filtrera _skräppost i mappen"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/V_erktyg/_Loggfönster"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Konfiguration"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguration/_Allmänna inställningar..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 #, fuzzy
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Konfiguration/_Filterinställningar..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguration/_Mall..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguration/_Åtgärder..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 #, fuzzy
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Konfiguration/_Mall..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Konfiguration/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguration/_Inställningar för aktuellt konto..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguration/Skapa _nytt konto..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguration/_Redigera konton..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguration/_Ändra aktuellt konto"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Hjälp/_Handbok"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hjälp/_Handbok/_Engelsk"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hjälp/_Handbok/_Japansk"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Hjälp/_FAQ"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjälp/_FAQ/_Engelsk"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjälp/_FAQ/_Tysk"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjälp/_FAQ/_Spansk"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjälp/_FAQ/_Fransk"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjälp/_FAQ/_Italiensk"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Kommandorad saknas."
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Hjälp/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr ""
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr ""
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Skapar huvudfönster...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "färdigt.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Du är frånkopplad. Vill du ansluta?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Töm alla papperskorgar"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -4068,16 +4098,16 @@ msgstr ""
 "Om den existerande brevlådan specificeras, kommer den\n"
 "att sökas igenom automatiskt."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4086,101 +4116,101 @@ msgstr ""
 "Brevlådan kunde inte skapas.\n"
 "Några filer finns redan eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappvy"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Svara till _alla"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Svara till av_sändaren"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Ikoner"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 #, fuzzy
 msgid "_Text"
 msgstr "Text"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 #, fuzzy
 msgid "_None"
 msgstr "Ingen"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 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:3117
+#: src/mainwindow.c:3128
 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:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Välj mapp"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommandorad saknas."
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Användning: %s [FLAGGOR]...\n"
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4199,7 +4229,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4218,15 +4248,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4469,240 +4499,240 @@ msgstr "Fil"
 msgid "Description: "
 msgstr "Beskrivning"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Öppnar fönster för kontoinställningar...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Inställningar för nytt konto"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Kontoinställningar"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Skapar fönster för kontoinställningar...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Ta emot"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Skicka"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Skriv"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Integritet"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Detta kontos namn"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Använd som förvalt konto"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Personlig information"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Fullst. namn"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "E-postadress"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Serverinformation"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Diskussionsgrupper (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Inget (lokalt)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Denna server kräver autentisering"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Diskussionsgruppsserver"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Server för mottagning"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Server att skicka med (SMTP)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Användar-ID"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Lösenord"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Använd säker autentisering (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Ta bort meddelanden på server när de mottagits"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Ta bort efter"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "dagar"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 dagar: ta bort direkt)"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Hämta alla meddelanden från server"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Gräns för mottagningsstorlek"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Filtrera meddelanden vid mottagning"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Förvald inkorg"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Ofiltrerade meddelanden kommer att lagras i denna mapp"
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "Bara vid manuell mottagning"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Filtrera meddelanden vid mottagning"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Maximalt antal inlägg att hämta"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Ingen begränsning om 0 är angivet."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "\"Hämta allt\" hämtar post på detta konto"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Brevhuvud"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Lägg till datumfält i brevhuvud"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Skapa Meddelande-ID"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr "Redigera..."
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Autentisering (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4710,250 +4740,254 @@ msgstr ""
 "Om du lämnar dessa poster tomma, kommer samma användar-ID och lösenord som "
 "vid hämtning att användas."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentisera med POP3 innan brev skickas"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Signatur"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Namn:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Kommandoutdata"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Sätt automatiskt följande adresser"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Kopia"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Dold kopia"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Signera alla meddelanden"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Kryptera alla meddelanden"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Kryptera vid svar på krypterat meddelande"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "kan inte läsa mottagarlista"
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Använd ASCII-pansar för kryptering"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Använd klartextsignatur"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Använd förvald GnuPG-nyckel"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Välj nyckel genom din e-postadress"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Ange nyckel manuellt"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Användar- eller nyckel-ID:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Använd inte SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Använd SSL för POP3-förbindelse"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Använd STARTTLS-kommando för att starta SSL-session"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Använd SSL för IMAP4-förbindelse"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Använd SSL för NNTP-förbindelse"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Skicka (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Använd SSL för SMTP-förbindelse"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Använd icke-blockerande SSL"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Slå av detta om du har problem med SSL-förbindelsen"
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 #, fuzzy
 msgid "Hostname:"
 msgstr "Värdnamn"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 #, fuzzy
 msgid "Port:"
 msgstr "Port"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 #, fuzzy
 msgid "Use authentication"
 msgstr "Autentisering"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Namn:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 #, fuzzy
 msgid "Password:"
 msgstr "Lösenord"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 #, fuzzy
 msgid "Use SOCKS proxy on sending"
 msgstr "Skicka med externt program"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Ange SMTP-port"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Ange POP3-port"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Ange IMAP4-port"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Ange NNTP-port"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Ange domännamn"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP-servermapp"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "Hämta alla meddelanden från server"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Lägg skickade meddelanden i"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Lägg utkast i"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "Lägg borttagna meddelanden i"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Lägg borttagna meddelanden i"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Kontonamn har inte angivits."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "E-postadress har inte angivits."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "SMTP-server har inte angivits."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Användar-ID har inte angivits."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "POP3-server har inte angivits."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-server har inte angivits."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "NNTP-server har inte angivits."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/tr.po b/po/tr.po
index 1825a9ff..0847c95f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2012-06-18 19:03+0300\n"
 "Last-Translator: Doruk Fisek <dfisek@ozguryazilim.com.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -34,202 +34,207 @@ msgstr "Gereksiz posta süzgeci (elle)"
 msgid "Junk mail filter"
 msgstr "Gereksiz posta süzgeci"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s adresine yapılmış IMAP4 bağlantısı koptu. Yeniden bağlanılıyor...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 sunucusu LOGIN işlemini pasifleştiriyor.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "IMAP bağlantısı kurulamadı\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d adresine IMAP4 bağlantısı yapılıyor ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "TLS oturumuna bağlantı kurulamadı.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(İŞARETLER alınıyor...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "İleti alınıyor: %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "İletiler %s arkasına ekleniyor (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "%s iletisi %s  içine kopyalanıyor..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "%s iletisi %s  içine kopyalanıyor..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "%s iletileri siliniyor"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "silinen işaretler atanamıyor: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "silinemiyor\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "%s konumundaki tüm iletiler siliniyor"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "silinen işaretler atanamıyor: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "dizin kapatılamadı\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s kök dizini bulunamadı\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST alınırken hata oluştu.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "%s oluşturulamadı\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "%s Gelen kutusu altında oluşturulamadı\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "posta kutusu yaratılamıyor: Liste hatası\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "posta kutusu oluşturulamadı\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "posta kutusu oluşturulamadı\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s posta kutusunun adı %s olarak değiştirilemedi \n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "posta kutusu silinemedi\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "İleti başlıkları alınıyor (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "zarf alınırken bir hata oluştu.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "zarf ayrıştırılamadı: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "zarf alınamadı\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 oturumuna %s:%d ile bağlantı kurulamadı\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "alanadına erişilemedi\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "dizin seçilemedi: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "imap komutunda hata oluştu: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 yetkilendirmesi başarısız.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 girişinde hata.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s, %s üzerine eklenemedi\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(dosya gönderiliyor...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ileti %s'ye eklenemiyor\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s, %s konumuna kopyalanamadı\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap komutu sırasında hata oluştu: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "EXPUNGE komutu sırasında hata oluştu\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv, UTF-7 yi %s'e çeviremedi\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv %s yi UTF-7'ye çeviremedi\n"
@@ -505,7 +510,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "POP3 oturumunda hata oluştu\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "Yapılandırma dosyasına kayıt yapılamadı\n"
@@ -557,50 +562,50 @@ msgstr "kötü SMTP cevabı\n"
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP oturumunda hata oluştu\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 kullanılamıyor\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 etkin\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 kullanılamıyor\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 etkin\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "SSL yöntemi kullanılamıyor\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Bilinmeyen SSL yöntemi: Program hatası\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "SSL metni oluşturulurken hata\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL bağlantısı %s kullanarak yapıldı\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Sunucu sertifikası:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Konu: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Veren: %s\n"
@@ -656,7 +661,7 @@ msgstr ""
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA adresine konuyla ilgili "
 "yazınız."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -694,14 +699,14 @@ msgstr ""
 "etkin duruma getirilebilir."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Ad"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -829,13 +834,13 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Adres"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notlar"
 
@@ -847,7 +852,7 @@ msgstr "Adres Defteri Dizinini Seç"
 msgid "Auto-registered address"
 msgstr "Otomatik-kaydedilmiş adres"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Dosya"
@@ -868,10 +873,10 @@ msgstr "/_Dosya/Yeni _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Dosya/Yeni _LDAP Sunucu"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Dosya/---"
@@ -888,21 +893,21 @@ msgstr "/_Dosya/_Sil"
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
@@ -946,7 +951,7 @@ msgstr "/_Adres/Dü_zenle"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/A_raçlar"
@@ -959,12 +964,12 @@ msgstr "/A_raçlar/_LDIF dosyasını içe aktar"
 msgid "/_Tools/Import _CSV file"
 msgstr "/A_raçlar/_CSV dosyasını içe aktar"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
@@ -982,7 +987,7 @@ msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1024,7 +1029,7 @@ msgstr "Adres defteri"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Dizin"
 
@@ -1036,17 +1041,17 @@ msgstr "E-posta adresi"
 msgid "Search:"
 msgstr "Ara:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Kime:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1252,7 +1257,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Not"
 
@@ -1308,392 +1313,397 @@ msgstr "Kahverengi"
 msgid "None"
 msgstr "Hiçbiri"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Aç"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/_Ekle..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Sil"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/Ö_zellikler..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Dosya/_Gönder"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Dosya/_Sonra gönder"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Dosya/T_aslak dizine kaydet"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Dosya/_Kaydet ve düzenlemeye devam et"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Dosya/_Dosya ekle"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Dosya/Dosya _içer"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Dosya/İ_mza ekle"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Dosya/İmzayı _sonuna ekle"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/Dü_zenle/_Geri al"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/Dü_zenle/_Yenile"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/Dü_zenle/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/Dü_zenle/_Kes"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Dü_zenle/_Alıntı Yaparak Yapıştır"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/Dü_zenle/_Tümünü seç"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Dü_zenle/_Bulunulan paragrafı sar"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Dü_zenle/Tüm _uzun satırları kaydır"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Dü_zenle/Otomatik ka_ydır"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Görünüm"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Görünüm/_Alıcı"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Görünüm/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Görünüm/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/_Görünüm/_Yanıt Adresi"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Görünüm/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/_Görünüm/_Yanıtlanan İleti"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Görünüm/_Cetvel"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Görünüm/_Ek"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Görünüm/Araç çubuğunu _özelleştir"
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Görünüm/Karakter _kodlaması"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Görünüm/Karakter _kodlaması/_Otomatik"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Görünüm/Karakter _kodlaması/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Görünüm/Karakter _kodlaması/7 bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Görünüm/Karakter_kodlaması/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Görünüm/Karakter_kodlaması/Batı Avrupa (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Görünüm/Karakter_kodlaması/Batı Avrupa (ISO-8859-_15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Görünüm/Karakter_kodlaması/Orta Avrupa (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Görünüm/Karakter_kodlaması/_Baltık (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Görünüm/Karakter_kodlaması/Baltık (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Görünüm/Karakter_kodlaması/Kiril (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Görünüm/Karakter_kodlaması/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Görünüm/Karakter_kodlaması/Arapça (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Görünüm/Karakter_kodlaması/Arapça (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Görünüm/Karakter_kodlaması/İbranice (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Görünüm/Karakter_kodlaması/İbranice (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Görünüm/Karakter_kodlaması/Türkçe (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Görünüm/Karakter_kodlaması/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Görünüm/Karakter_kodlaması/Kiril (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Görünüm/Karakter_kodlaması/Kiril (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Görünüm/Karakter_kodlaması/Kiril (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Görünüm/Karakter_kodlaması/Japonca (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Görünüm/Karakter_kodlaması/Basitleştirilmiş Çince (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Görünüm/Karakter_kodlaması/Basitleştirilmiş Çince (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Görünüm/Karakter_kodlaması/Geleneksel Çince (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Görünüm/Karakter_kodlaması/Korece (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Görünüm/Karakter_kodlaması/Tayca (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Görünüm/Karakter_kodlaması/Tayca (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/A_raçlar/_Adres defteri"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/A_raçlar/E_ylemler"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/A_raçlar/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/A_raçlar/Harici _düzenleyicide aç"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/A_raçlar/Okundu_bilgisi iste"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/A_raçlar/Yazım _denetle"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/A_raçlar/Yazım denetleme dili _ata"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: dosya bulunamadı\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Metin bölümü alınamadı\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Alıntı formatı hatası."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet formatı hatası"
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamadı."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı iletinin bir bölümü alınamadı"
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - İleti Oluştur%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "İmza"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Boş konu satırı"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Ek dosya eksik"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Hiç ek yok. Yine de eksiz göndermek istiyor musunuz?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Alıcıları kontrol et"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Gerçekten aşağıdaki adreslere bu e-postayı gönderelim mi?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Konu:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "_Gönder"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
@@ -1701,11 +1711,11 @@ msgstr ""
 "Yeni ileti kontrolü şu anda çalışıyor.\n"
 "Lütfen daha sonra tekrar deneyin."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1713,40 +1723,40 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 "İleti gönderimi tamamlandı ama ileti gönderilen kutusuna kaydedilemedi."
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, 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:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "İleti imzalanamadı."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "İleti şifrelenemedi."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "İleti şifrelenemedi ya da imzalanamadı."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1757,11 +1767,11 @@ msgstr ""
 "\n"
 " Yine de %s olarak gönderelim mi?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Kodlama çevirim hatası"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1774,15 +1784,15 @@ msgstr ""
 "\n"
 "Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Satır uzunlık sınırı"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Bcc ile Şifreleme"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1796,94 +1806,104 @@ msgstr ""
 "\n"
 "Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "%s dosyası bulunamadı."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "%s dosyası açılamadı."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "İleti oluşturma penceresi oluşturuluyor...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "PGP İmzala"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "PGP Şifrele"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Veri tipi"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "İmza"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "İmza kontrol ediliyor"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "Dosya bulunamadı."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Çalıştırılabilir dosya açılıyor"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1895,12 +1915,12 @@ msgstr ""
 "Eğer açmak istiyorsanız, bir yere kaydedin ve virüs ya da benzer bir art "
 "niyetli program olmadığına emin olun."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, 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:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1909,48 +1929,48 @@ msgstr ""
 "Harici düzenleyici hala çalışıyor.\n"
 "Bu süreci zorla sonlandırayım mı (pid: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "Araç çubuğunu_özelleştir..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Dosyaları seç"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "İletiyi kaydet"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Taslak dizine kaydedilsin mi?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Ka_ydetmeden kapat"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "De_ğiştir"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_İçer"
 
@@ -1991,7 +2011,7 @@ msgid "Nick Name"
 msgstr "Lakabı"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-posta Adresi"
 
@@ -2049,7 +2069,7 @@ msgid " Check File "
 msgstr " Dosyayı Denetle "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Dosya"
 
@@ -2057,63 +2077,63 @@ msgstr "Dosya"
 msgid "Add New Address Book"
 msgstr "Yeni Adres Defteri Ekle"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Bir Grup Adı verilmelidir."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Grup Bilgisini Düzenle"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Grup Adı"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Kullanılabilir Adresler"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Gruptaki Adresler"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr ""
 "E-posta adresini yön tuşlarını kullanarak gruba yerleştirin veya kaldırın"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Grup Ayrıntılarını Düzenle"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Yeni Grup Ekle"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Dizini düzenle"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adıni girin:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını verin:"
 
@@ -2130,7 +2150,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot Girdisini Düzenle"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2195,7 +2215,7 @@ msgstr "Zaman aşımı (sn) "
 msgid "Maximum Entries"
 msgstr "Azami Girdi Sayısı"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Temel"
 
@@ -2281,7 +2301,7 @@ msgid "MH (number only)"
 msgstr "MH (yalnız numara)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Seç... "
 
@@ -2464,12 +2484,12 @@ msgstr "Dizin bilgisi ayarlanıyor...\n"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
@@ -3292,683 +3312,693 @@ msgstr ""
 "Eski sürümden kalma ayarlar bulundu.\n"
 " Ayarları yeni sürüme aktarmak ister misiniz?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Dosya/Di_zin"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Dosya/Di_zin/Y_eni dizin oluştur..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Dosya/Di_zin/Di_zini yeniden adlandır..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Dosya/Di_zin/Di_zini taşı..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Dosya/Di_zin/Dizini _sil"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Dosya/_Posta kutusu"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Dosya/_Posta kutusu/Posta kutusu e_kle..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Dosya/_Posta Kutusu/_Posta kutusunu kaldır"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Dosya/_Posta Kutusu/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Dosya/_Posta Kutusu/Yeni iletiler için k_ontrol et"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/_Dosya/_Posta Kutusu/_Tüm posta kutuları için yeni ilerileri kontrol et"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Dosya/_Posta Kutusu/Dizin ağacını _yeniden oluştur"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/_Dosya/E-posta verisi _içe aktar..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/_Dosya/_E-posta verisi _dışa aktar..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Dosya/Tüm çö_pü boşalt"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Dosya/_Farklı kaydet..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/_Dosya/_Sayfa ayarları"
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Dosya/_Yazdır..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Dosya/Çevrimdı_şı çalış"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Dosya/Çı_k"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/Dü_zenle/_Sıralı seç"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/Dü_zenle/Bulunula_n iletide bul..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/Dü_zenle/_İletilerde ara..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/Dü_zenle/_Hızlı arama"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Görünüm/Göster veya _gizle"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Görünüm/Göster veya _gizle/_Dizin ağacı"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Görünüm/Göster veya _gizle/İ_leti görünümü"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/Simge _ve metin"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Görünüm/Göster veya _gizle/Simgenin sa_ğında metin"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Simge"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Metin"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Hiçbiri"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Görünüm/Göster veya _gizle/Arama _çubuğu"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Görünüm/Göster veya _gizle/_Durum çubuğu"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Görünüm/Araç çubuğunu _özelleştir"
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/_Görünüm/_Yerleşim"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Görünüm/_Yerleşim/_Normal"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/_Görünüm/Sıra_la/Dikey"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Görünüm/D_izin ağacını ayır"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Görünüm/_Ayrı ileti görünümü"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Görünüm/Sıra_la"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Görünüm/Sıra_la/_Numaraya göre"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Görünüm/Sıra_la/_Boyuta göre"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Görünüm/Sıra_la/_Tarihe göre"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Görünüm/Sıra_la/konu _başlığı tarihine göre"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Görünüm/Sıra_la/_Gönderene göre"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Görünüm/Sıra_la/_Alıcıya göre"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Görünüm/Sıra_la/_Konuya göre"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Görünüm/Sıra_la/_Renge göre"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Görünüm/Sıra_la/İş_arete göre"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Görünüm/Sıra_la/_Okunmamışa göre"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Görünüm/Sıra_la/E_klentiye göre"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Görünüm/Sıra_la/_Sıralama yapma"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Görünüm/Sıra_la/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Görünüm/Sıra_la/Artan sırala"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Görünüm/Sıra_la/Azalan sırala"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Görünüm/Sıra_la/Konuya _göre izle"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Görünüm/_Konum görünümü"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Görünüm/Tüm _başlıkları genişlet"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Görünüm/Tüm _başlıkları küçült"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Görünüm/_Görüntü öğesini seç..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Görünüm/_Git"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Görünüm/_Git/Önceki _ileti"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Görünüm/_Git/Sonraki _ileti"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Görünüm/_Git/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Görünüm/_Git/Ö_nceki okunmamış ileti"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Görünüm/_Git/_Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Görünüm/_Git/Ö_nceki yeni ileti"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Görünüm/_Git/Sonraki _yeni ileti"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Görünüm/_Git/Önceki _işaretli ileti"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Görünüm/_Git/S_onraki işaretli ileti"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Görünüm/_Git/Ö_nceki _etiketli ileti"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Görünüm/_Git/Son_raki etiketli ileti"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Görünüm/_Git/_Başka dizine git..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Görünüm/_Karakter kodlama/_Otomatik tanı"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Görünüm/_Karakter kodlama/Batı Avrupa (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Görünüm/_Karakter kodlaması/Japonca (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Görünüm/Karakter kodlaması/Japonca (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Görünüm/Karakter kodlaması/Japonca (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Görünüm/Karakter kodlaması/Geleneksel Çince (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Görünüm/Karakter kodlaması/Çince (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Görünüm/Karakter kodlaması/Korece (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Görünüm/Yeni _pencerede aç"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Görünüm/İ_leti kaynağı"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/_Görünüm/Tüm _başlıklar"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Görünüm/_Görünümü güncelle"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/İ_leti"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/İ_leti/_Al"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/İ_leti/_Al/Bulunu_lan hesaptan al"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/İ_leti/_Al/T_üm hesaplardan al"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/İ_leti/_Al/Almayı _durdur"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/İ_leti/_Al/_Uzak posta kutusu..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/İ_leti/_Al/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/İ_leti/_Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/İ_leti/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/İ_leti/Yeni _ileti oluştur"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/İ_leti/Yanıtl_a"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/İ_leti/B_aşkasına yanıtla"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/İ_leti/B_aşkasına yanıtla/_herkese"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/İ_leti/B_aşkasına yanıtla/_gönderene"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/İ_leti/B_aşkasına yanıtla/eposta l_istesine"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/İ_leti/E_k olarak yönlendir"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/İ_leti/Taşı..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/İ_leti/_Kopyala..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/İ_leti/İş_aretle"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/İ_leti/İş_aretle/İş_aretle"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/İ_leti/İş_aretle/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/İ_leti/İş_aretle/O_kunmamış olarak işaretle"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/İ_leti/İş_aretle/Ok_unmuş olarak işaretle"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/İ_leti/İş_aretle/Konu başlığını ok_unmuş olarak işaretle"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/İ_leti/İş_aretle/Hepsini _okunmuş olarak işaretle"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/İ_leti/_Sil"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/İ_leti/Gereksiz posta olarak işaretle"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/İ_leti/Gereksiz _olmayan posta olarak işaretle"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/İ_leti/Ye_niden düzenle"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/A_raçlar/Göndereni adres defterine _ekle"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm iletileri süz"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/A_raçlar/S_eçilen tüm iletileri süzgeçten geçir"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/A_raçlar/Süzgeç _kuralı oluştur"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/A_raçlar/Süzgeç _kuralı oluştur/_Otomatik oluştur"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/A_raçlar/Süzgeç _kuralı oluştur/_Gönderene göre oluştur"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/A_raçlar/Süzgeç _kuralı oluştur/_Alıcıya göre oluştur"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/A_raçlar/Süzgeç _kuralı oluştur/_Konuya göre oluştur"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm gereksiz postaları süz"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/A_raçlar/S_eçilen tüm iletileri süzgeçten geçir"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/A_raçlar/Ç_ift iletileri sil"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/A_raçlar/Ayrılmış iletileri _bitiştir"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Araçlar/İşaretlenmiş süreci i_şlet"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/A_raçlar/_Dizin içindeki tüm gereksiz postaları süz"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/A_raçlar/_Dizin içindeki tüm iletileri süz"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/A_raçlar/_Kayıt penceresi"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/_Yapılandırma"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Yapılandırma/_Genel tercihler..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/_Yapılandırma/Sü_zgeç ayarları..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/_Yapılandırma/Ş_ablon..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/_Yapılandırma/_Eylemler..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/_Yapılandırma/Eklenti _yöneticisi..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/_Yapılandırma/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Yapılandırma/Bu_lunulan hesap tercihleri..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Yapılandırma/Y_eni hesap oluştur..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Yapılandırma/Hesapları _düzenle..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Yapılandırma/B_ulunulan hesabı değiştir"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/Yardı_m/_Kılavuz"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/Yardı_m/_Kılavuz/İ_ngilizce"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Yardı_m/_Kılavuz/_Japonca"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/Yardı_m/_SSS"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/Yardı_m/_SSS/İ_ngilizce"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/Yardı_m/_SSS/_Almanca"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Yardı_m/_SSS/İ_spanyolca"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/Yardı_m/_SSS/_Fransızca"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Yardı_m/_SSS/İ_talyanca"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Yardım/_Komut satırı seçenkleri"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/Yardı_m/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/_Yardım/_Güncelleme kontrolü"
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/_Yardım/_Eklentilerin güncelleme kontrolü"
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Yeni pencere oluşturuluyor...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, 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:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "bitti.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Başlıksız"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "hiçbiri"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Çevrimdışısınız. Çevrimiçi olunsun mu?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Tüm çöpü boşalt"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3978,16 +4008,16 @@ msgstr ""
 "Eğer varolan posta kutusu verilirse, kutu otomatik\n"
 "olarak taranacaktır."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3996,95 +4026,95 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar bulunuyor olabilir veya yeterli izine sahip olmayabilirsiniz."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylheed - Dizin Görünümü"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Her_kese yanıtla"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/_Gönderene yanıtla"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Simge _ve yazı"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Metin simgenin sa_ğında"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "_Simge"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "_Metin"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "_Hiçbiri"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 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:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Programdan çıkılsın mı?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "Seçili iletiler birleştirilemedi."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Açılacak dizini seç"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Komut satırı seçenekleri"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kullanım: sylpheed [SEÇENEK]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4117,7 +4147,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4148,15 +4178,15 @@ msgstr ""
 "hata ayıklama kipi\n"
 "sürüm bilgisini göster ve çık"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Yalnız Windows'ta geçerli seçenek:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport kapıno (portno)"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "IPC uzak komutları için kapı (port) belirt"
 
@@ -4390,236 +4420,236 @@ msgstr "Dosya: "
 msgid "Description: "
 msgstr "Tanım: "
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Hesap tercihleri penceresi açılıyor...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Hesap%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Yeni hesap için tercihler"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Hesap tercihleri"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Hesap tercihleri penceresi oluşturuluyor...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Al"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Gönder"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Oluştur"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Vekil (Proxy)"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Bu hesabın adı"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Öntanımlı kullan"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Kişisel bilgiler"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Tam adı"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "E-Posta adresi"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Kurum"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Sunucu bilgisi"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Haber grubu (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Hiçbiri (yerel)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Bu sunucu parola istiyor"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Haber grubu sunucusu"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "İletilerin alınacağı sunucu"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Gönderme için SMTP sunucu"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "Kullanıcı adı"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Parola"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Güvenli yetkilendirme kullan (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "İleti alındığı zaman sunucudaki kopyasını sil"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Postayı"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "gün sonra sil"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "(0 gün: hemen kaldır)"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Sunucudaki tüm iletileri indir (daha önce alınanlar dahil)"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Alınan ileti boyutu sınırı"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "İletileri alırken süz"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Öntanımlı gelen kutusu"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Süzülmemiş iletiler bu dizinde saklanacak."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Kimlik denetim yöntemi"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Alırken yalnız Gelen Kutusu'nu kontrol et"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Alırken Gelen Kutusu'ndaki yeni iletileri süz"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Haberler"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "İndirilecek en fazla yazı sayısı"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "0 belirtilirse sınırsız."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "'Hepsini Al' seçeneği bu hesaptaki yeni postaları da kontrol etsin"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Başlık"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Tarih başlığını ekle"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "İleti Numarası Oluştur"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Kullanıcı tanımlı başlık ekle"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Düzenle... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Kimlik denetimi"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Kimlik Denetimi (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4627,241 +4657,245 @@ msgstr ""
 "Eğer bu girdileri boş bırakırsanız, posta alımı ile aynı kullanıcı adı (ID) "
 "ve parolası kullanılır."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Göndermeden önce POP3 ile kimlik denetimi yap"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "İmza"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Doğrudan girdi"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Ad:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Komut çıktısı"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "İmzayı alıntıdan önce yerleştir (önerilmez)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Aşağıdaki adresleri otomatik olarak tanımla"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Yanıtla"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "İletileri öntanımlı olarak PGP ile imzala"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "İletileri öntanımlı olarak PGP ile şifrele"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Şifrelenmiş iletiyi yanıtlarken şifrele"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "alıcı listesi alınamadı."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "ASCII formatında şifrele"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Metin formatlı imza ekle"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Öntanımlı GnuPG anahtarını kullan"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Anahtarı e-posta adresine göre seç"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Anahtarı elle seç"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Kullanıcı ya da anahtar numarası (ID):"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "SSL kullanma"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "SSL oturumuna başlamak için STARTSSL komutunu kullan"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Gönder (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP bağlantısı için SSL kullan"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Bloklanmamış SSL Kullan"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "SSL bağlantısında sorunlar yaşıyorsanız, bu seçeneği kapatın"
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "SOCKS vekil sunucu kullan"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Makine Adı:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Kapı (Port):"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Doğrulama kullan"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Ad:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Parola:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Gönderim için SOCKS vekil sunucu kullan"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "SMTP kapısı (portu) belirt"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "POP3 kapısı (portu) belirt"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "IMAP4 kapısı (portu) belirt"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "NNTP kapısı (portu) belirt"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Alan adı belirt"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP sunucu dizini"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Yalnız bu dizinin alt dizinleri gösterilecek."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Çıkışta tüm ileti önbelleklerini boşalt"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Gönderilen iletileri nerede sakla"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Taslak iletilerini buraya koy"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Kuyruktaki iletileri buraya koy"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Silinen iletileri buraya koy"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Hesap adı girilmemiş."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "İleti adresi girilmemiş."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "SMTP sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Kullanıcı adı (ID) girilmemiş."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "POP3 sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4 sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "NNTP sunucu girilmemiş."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Belirtilen dizin bir kuyruk dizini değil."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/uk.po b/po/uk.po
index 1594c311..3c0580dc 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2014-03-25 19:20+0300\n"
 "Last-Translator: Vladimir Smolyar <v_2e@ukr.net>\n"
 "Language-Team: Ukrainian\n"
@@ -34,202 +34,207 @@ msgstr "Фільтр спаму (вручну)"
 msgid "Junk mail filter"
 msgstr "Фільтр спаму"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "З'єднання IMAP4 до %s втрачено. Відновлення...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Сервер IMAP4 відключив LOGIN.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "Не вдалося встановити з'єднання IMAP.\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "створення з'єднання IMAP4 до %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Не вдалося почати сесію TLS.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(отримання FLAGS...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "Отримання листа %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Додання листів до %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Перенесення листів %s до %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копіювання листів %s до %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Видалення листів з %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не вдалося встановити прапорець видалення: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "не вдалося очистити папку від видалених листів\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Видалення усіх листів у %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не вдалося встановити прапорець видалення: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "не вдалося закрити папку\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "коренева папка %s не існує\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "помилка при отриманні LIST'а.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Не вдалося створити \"%s\"\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Не вдалося створити \"%s\" всередині INBOX\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не вдалося створити скриньку: невдача LIST\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "не вдалося створити скриньку\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "не вдалося створити скриньку\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не вдалося перейменувати скриньку: %s на %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "не вдалося видалити скриньку\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Отримання заголовків листів (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "трапилася помилка при отриманні конверта.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "не вдалося розібрати конверт: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "не вдалося отримати конверт\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не вдалося з'єднатися з сервером IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не вдалося встановити сесію IMAP4 з: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "не вдалося отримати простір імен\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не вдалося обрати папку: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "помилка при виконанні команди imap: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не вдалося додати %s до %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(надсилання файла...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не вдалося приєднати лист до %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не вдалося скопіювати %s в %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "помилка при виконанні команди imap:  STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "помилка при виконанні команди imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "помилка при виконанні команди imap: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може конвертувати UTF-7 в %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може конвертувати %s в UTF-7\n"
@@ -505,7 +510,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "помилка під час сесії POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "не вдалося записати конфігурацію у файл\n"
@@ -557,50 +562,50 @@ msgstr "погана відпоідь SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "помилка під час сесії SMTP\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 недоступний\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 доступний\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 недоступний\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 доступний\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "Метод SSL недоступний\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Невідомий метод SSL *ПОМИЛКА В ПРОГРАМІ*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Помилка створення контексту ssl\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "З'єднання SSL за допомогою %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Сертифікат сервера:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Тема:  %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Видав: %s\n"
@@ -659,7 +664,7 @@ msgstr ""
 "програмою; якщо це не так, пишіть у Free Software Foundation, Inc., 59 "
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -696,14 +701,14 @@ msgstr ""
 "записи, які перевірятимуться через \"Отримати всі\"."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Ім'я"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -831,13 +836,13 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додання адреси до Книги"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Адреса"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Нотатки"
 
@@ -849,7 +854,7 @@ msgstr "Обeріть папку Адресної Книги"
 msgid "Auto-registered address"
 msgstr "Адреса, зареєстрована автоматично"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/Файл"
@@ -870,10 +875,10 @@ msgstr "/Файл/Новий JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новий сервер LDAP"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/Файл/---"
@@ -890,21 +895,21 @@ msgstr "/Файл/Видалити"
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/Редагувати"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/Редагувати/Вставити"
 
@@ -948,7 +953,7 @@ msgstr "/Адреса/Редагувати"
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/Інструменти"
@@ -961,12 +966,12 @@ msgstr "/Інструменти/Імпортувати файл LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/Інструменти/Імпортувати файл CSV"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
@@ -984,7 +989,7 @@ msgid "/New _Folder"
 msgstr "/Нова папка"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1026,7 +1031,7 @@ msgstr " Адресна книга "
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr " Папки "
 
@@ -1038,17 +1043,17 @@ msgstr "Адреса e-mail"
 msgid "Search:"
 msgstr "Пошук:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Приховано:"
@@ -1251,7 +1256,7 @@ msgstr "Спільна адреса"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1307,392 +1312,397 @@ msgstr "Коричневий"
 msgid "None"
 msgstr "Немає"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/Відкрити"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/Додати..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/Видалити"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/Властивості..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/Файл/Надіслати"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/Файл/Надіслати пізніше"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/Файл/Зберегти у папці чернеток"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/Файл/Зберегти і редагувати далі"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/Файл/Приєднати файл"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/Файл/Вставити файл"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/Файл/Вставити підпис"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/Файл/Приєднати підпис"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/Редагувати/Відмінити дію"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/Редагувати/Повторити дію"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/Редагувати/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/Редагувати/Вирізати"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Редагувати/Вставити як цитату"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/Редагувати/Виділити все"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Редагувати/Перенести поточний абзац"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Редагувати/Перенести усі довгі рядки"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Редагувати/Автоматичне перенесення"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/Вигляд"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/Вигляд/Кому"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/Вигляд/Копія"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/Вигляд/Приховано"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/Вигляд/Зворотна адреса"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/Вигляд/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/Вигляд/Конференції для відповіді"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/Вигляд/Лінійка"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/Вигляд/Вкладення"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Вигляд/Налаштувати панель інструментів"
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/Вигляд/Кодування"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/Вигляд/Кодування/_Aвтоматичне"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/Вигляд/Кодування/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вигляд/Кодування/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вигляд/Кодування/Unicode (UT_F-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вигляд/Кодування/Західноєвропейська (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вигляд/Кодування/Західноєвропейська (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вигляд/Кодування/Центральноєвропейська (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вигляд/Кодування/Балтійська (ISO-8859-1_3)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вигляд/Кодування/Балтійська (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Вигляд/Кодування/Балтійська (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вигляд/Кодування/Грецька (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Вигляд/Кодування/Арабська (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Вигляд/Кодування/Арабська (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вигляд/Кодування/Єврейська (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вигляд/Кодування/Єврейська (_Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вигляд/Кодування/Турецька (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вигляд/Кодування/Кирилиця (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вигляд/Кодування/Кирилиця (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вигляд/Кодування/Кирилиця (KOI8-_U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вигляд/Кодування/Кирилиця (_Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вигляд/Кодування/Японська (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вигляд/Кодування/Спрощена китайська (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вигляд/Кодування/Спрощена китайська (_GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вигляд/Кодування/Традиційна китайська (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вигляд/Кодування/Корейська (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вигляд/Кодування/Тайська (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вигляд/Кодування/Тайська (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/Інструменти/Адресна книга"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/Інструменти/Шаблон"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/Інструменти/Дії"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/Інструменти/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/Інструменти/Редагувати зовнішнім редактором"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/Інструменти/Запросити підтвердження прочитання"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/Інструменти/Підпис PGP"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/Інструменти/Шифрування PGP"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/Інструменти/Перевірка правопису"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/Інструменти/Обрати мову для перевірки правопису"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: файл не існує\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Не вдалося отримати частину тексту\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Помилка у форматі цитування."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Помилка у форматі відповіді/пересилання."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існує\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалося отримати розмір %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Не вдалося прочитати %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Лист: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалося отримати одну з частин листа."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr " Підпис "
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Порожня тема"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле \"Тема\" порожнє. Все ж послати?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "Бракує вкладення"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "Вкладення немає. Послати без вкладень?"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "Перевірити отримувачів"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "Дійсно надіслати цю пошту на наступні адреси?"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Тема:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "Надіслати"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
@@ -1700,11 +1710,11 @@ msgstr ""
 "Триває перевірка нових листів.\n"
 "Будь ласка, спробуйте пізніше."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "не вдалося отримати список отримувачів."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1712,39 +1722,39 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь ласка, запис перед відправкою."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилася помилка під час надсилання листа до %s ."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr "Листа надіслано, але він не може бути збережений в папці вихідних."
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалося знайти ключа, відповідного обраному ідентифікатору \"%s\"."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "Не вдалося підписати листа."
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "Не вдалося зашифрувати листа."
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "Не вдалося зашифрувати чи підписати листа."
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "не вдалося змінити права доступу файлу\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1755,11 +1765,11 @@ msgstr ""
 "%s на %s.\n"
 "Все одно надіслати у %s?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Помилка при перетворенні кодування"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1772,15 +1782,15 @@ msgstr ""
 "\n"
 "Все одно надіслати?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "Шифрувати з прихованими адресатами"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1794,94 +1804,104 @@ msgstr ""
 "\n"
 "Все одно послати?"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "не вдалося видалити старий лист\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "Додання листа до черги...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "не вдалося знайти папку черги\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "не вдалося додати листа до черги\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "Файл %s не існує."
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "Не вдалося відкрити файл %s."
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Відкриття вікна створення листа...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "Тип даних"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr " Підпис "
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Перевірка підпису"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "Файл не існує."
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Відкриття виконуваного файлу"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1893,12 +1913,12 @@ msgstr ""
 "Якщо бажаєте запустити цей файл, збережіть його і переконайтеся, що це не "
 "вірус чи щось шкідливе."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: \"%s\"\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1907,48 +1927,48 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово перервати процес (pid: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "Налаштувати панель інструментів..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Не вдалося додати листа до черги."
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти у папці чернеток?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Бажаєте застосувати шаблон \"%s\" ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -1989,7 +2009,7 @@ msgid "Nick Name"
 msgstr "Прізвисько"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Адреса e-mail"
 
@@ -2047,7 +2067,7 @@ msgid " Check File "
 msgstr " Перевірити файл "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Файл"
 
@@ -2055,62 +2075,62 @@ msgstr "Файл"
 msgid "Add New Address Book"
 msgstr "Додання нової адресної книги"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Потрібно вказати назву групи."
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Редагувати дані групи"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Назва групи"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Наявні адреси"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Адреси в групі"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Переміщуйте адреси e-mail з чи до групи кнопками зі стрілками"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Редагування подробиць групи"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Додати нову групу"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Редагування папки"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Введіть нову назву папки:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Введіть назву нової папки:"
 
@@ -2127,7 +2147,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редагувати запис JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2192,7 +2212,7 @@ msgstr "Таймаут (с)"
 msgid "Maximum Entries"
 msgstr "Максимальний розмір результату"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Основні"
 
@@ -2278,7 +2298,7 @@ msgid "MH (number only)"
 msgstr "MH (тільки номер)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " Обрати... "
 
@@ -2459,12 +2479,12 @@ msgstr "Встановлення інформації папки...\n"
 msgid "Setting folder info..."
 msgstr "Встановлення інформації папки..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перегляд папки %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перегляд папки %s ..."
@@ -3284,683 +3304,693 @@ msgstr ""
 "Знайдено налаштування для попередньої\n"
 "версії. Перенести їх у нову версію?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/Файл/Папка"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Файл/Папка/Створити нову..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Файл/Папка/Перейменувати..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/Файл/Папка/Перенести..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Файл/Папка/Видалити теку"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/Файл/Скринька"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Файл/Скринька/Додати скриньку..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Файл/Скринька/Видалити скриньку"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/Файл/Скринька/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Файл/Скринька/Перевірити нові листи"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Файл/Скринька/Перевірити нові листи в усіх скриньках"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Файл/Скринька/Перебудувати дерево папок"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/Файл/Імпортувати пошту..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/Файл/Експортувати пошту..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/Файл/Спорожнити весь кошик"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/Файл/Зберегти як..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/Файл/Налаштування сторінки..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/Файл/Друкувати..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/Файл/Працювати без з'єднання"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/Файл/Вийти"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/Редагувати/Виділити обговорення"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/Редагувати/Шукати в поточному листі..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/Редагувати/Пошук по листах..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/Редагувати/Швидкий пошук"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/Вигляд/Показати чи приховати"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Вигляд/Показати чи приховати/Дерево папок"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Вигляд/Показати чи приховати/Зміст листа"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Значок і текст"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr ""
 "/Вигляд/Показати чи приховати/Панель інструментів/Значок і текст праворуч"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Текст"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Немає"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Вигляд/Показати чи приховати/Панель пошуку"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Вигляд/Показати чи приховати/Панель стану"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/Вигляд/Налаштування панелі інструментів..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/Вигляд/Розташування"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/Вигляд/Розташування/Нормальне"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/Вигляд/Розташування/Вертикальне"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/Вигляд/Окреме вікно для дерева папок"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/Вигляд/Окреме вікно для перегляду листа"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/Вигляд/Сортувати"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/Вигляд/Сортувати/За номером"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Вигляд/Сортувати/За розміром"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/Вигляд/Сортувати/За датою"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Вигляд/Сортувати/За датою гілки обговорення"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/Вигляд/Сортувати/За відправником"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Вигляд/Сортувати/За одержувачем"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/Вигляд/Сортувати/За темою"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/Вигляд/Сортувати/За виділенням кольором"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/Вигляд/Сортувати/За позначкою"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/Вигляд/Сортувати/Окремо непрочитані"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Вигляд/Сортувати/За вкладенням"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Вигляд/Сортувати/Не сортувати"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/Вигляд/Сортувати/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/Вигляд/Сортувати/За зростанням"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/Вигляд/Сортувати/За спаданням"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Вигляд/Сортувати/Групувати за темою"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/Вигляд/Групувати гілки обговорення"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/Вигляд/Розгорнути усі обговорення"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/Вигляд/Згорнути усі обговорення"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/Вигляд/Встановити поля для показу..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/Вигляд/Перейти до"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Вигляд/Перейти до/Попереднього листа"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/Вигляд/Перейти до/Наступного листа"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/Вигляд/Перейти до/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Вигляд/Перейти до/Попереднього непрочитаного листа"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Вигляд/Перейти до/Наступного непрочитаного листа"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Вигляд/Перейти до/Попереднього нового листа"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Вигляд/Перейти до/Наступного нового листа"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Вигляд/Перейти до/Попереднього позначеного листа"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Вигляд/Перейти до/Наступного позначеного листа"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Вигляд/Перейти до/Попереднього листа, виділеного кольором"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Вигляд/Перейти до/Наступного листа, виділеного кольором"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вигляд/Перейти до/Іншої папки..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вигляд/Кодування/_Aвтовизначення"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Вигляд/Кодування/Західноєвропейська (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вигляд/Кодування/Японська (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вигляд/Кодування/Японська (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вигляд/Кодування/Японська (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вигляд/Кодування/Традиційна китайська (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вигляд/Кодування/Китайська (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вигляд/Кодування/Корейська (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/Вигляд/Відкрити у новому вікні"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/Вигляд/Вихідний текст листа"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/Вигляд/Усі заголовки"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/Вигляд/Оновити список"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/Лист"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/Лист/Отримати"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Лист/Отримати/Для поточного запису"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Лист/Отримати/Для всіх записів"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/Лист/Отримати/Зупинити отримання"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/Лист/Отримати/Віддалена скринька..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/Лист/Отримати/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/Лист/Відіслати відкладені листи"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/Лист/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/Лист/Написати нового листа"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Лист/Відповісти/усім"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Лист/Відповісти/відправнику"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Лист/Відповісти/у список розсилки"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/Лист/Переслати"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/Лист/Переслати як вкладення"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/Лист/Переадресувати"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/Лист/Перемістити"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/Лист/Копіювати"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/Лист/Позначка"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/Лист/Позначка/Вибрати"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/Лист/Позначка/Зняти вибір"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/Лист/Позначка/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Лист/Позначка/Позначити як непрочитаний"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Лист/Позначка/Позначити як прочитаний"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Лист/Позначка/Позначити гілку як прочитану"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Лист/Позначка/Позначити всі як прочитані"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/Лист/Видалити"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/Лист/Вважати спамом"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Лист/Не вважати спамом"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/Лист/Змінити"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Інструменти/Додати відправника до адресної книги"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Інструменти/Фільтрувати всі листи у папці"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Інструменти/Фільтрувати виділені листи"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/Інструменти/Створити правило фільтрування"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Інструменти/Створити правило фільтрування/Автоматично"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Інструменти/Створити правило фільтрування/За полем \"Від\""
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Інструменти/Створити правило фільтрування/За полем \"Кому\""
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Інструменти/Створити правило фільтрування/За полем \"Тема\""
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Інструменти/Фільтрувати спам у папці"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Інструменти/Фільтрувати спам у виділених листах"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Інструменти/Видалити повторювані листи"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/Інструменти/Об'єднати окремі листи"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/Інструменти/Виконати позначений процес"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/Інструменти/Фільтрувати спам у папці"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/Інструменти/Фільтрувати всі листи у папці"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/Інструменти/Вікно журналу"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/Конфігурація"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Конфігурація/Загальні налаштування..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/Конфігурація/Налаштування фільтра..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/Конфігурація/Шаблон..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/Конфігурація/Дії..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/Конфігурація/Менеджер плагінів..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/Конфігурація/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Конфігурація/Налаштування поточного запису..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/Конфігурація/Створити новий обліковий запис..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Конфігурація/Редагувати облікові записи..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/Конфігурація/Змінити поточний запис"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/Довідка/Посібник"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/Довідка/Посібник/Англійською"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Довідка/Посібник/Японською"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/Довідка/FAQ"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/Довідка/FAQ/Англійською"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/Довідка/FAQ/Німецькою"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Довідка/FAQ/Іспанською"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/Довідка/FAQ/Французькою"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Довідка/FAQ/Італійською"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/Довідка/Опції командного рядка"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/Довідка/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/Довідка/Перевірка оновлень"
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/Довідка/Перевірка оновлень плагінів..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Створення головного вікна...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача виділення кольору %d\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "виконано.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Без назви"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "немає"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Без з'єднання"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "З'єднання немає. Під'єднатись?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Спорожнити усі кошики"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Видалити всі листи з усіх кошиків?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Додання скриньки"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3970,16 +4000,16 @@ msgstr ""
 "Якщо вона вже існує, її буде перечитано\n"
 "автоматично."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька \"%s\" вже існує."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3989,95 +4019,95 @@ msgstr ""
 "Можливо, деякі файли вже існують, або Ви не маєте\n"
 "права записувати туди."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Лист"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/Відповісти"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Відповісти всім"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Відповісти відправникові"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти у список розсилки"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/Переслати"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Переслати як вкладення"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Переадресувати"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "Значок та текст"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "Текст праворуч від значка"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "Іконка"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "Текст"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "Немає"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "З'єднання немає. Клацніть на іконці, щоб під'єднатись."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Ви під'єднані. Клацніть на іконці, щоб від'єднатись."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Вийти з цієї програми?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "Обрані повідомлення не можна об'єднати."
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "Оберіть папку для відкриття"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Опції командного рядка"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Використання: sylpheed [ОПЦІЯ]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4111,7 +4141,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4145,15 +4175,15 @@ msgstr ""
 "показати цю довідку і вийти\n"
 "показати інформацію про версію і вийти"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Опція тільки для Windows:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport порт"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport порт      вказати порт для віддалених команд IPC"
 
@@ -4386,236 +4416,236 @@ msgstr "Файл: "
 msgid "Description: "
 msgstr "Опис: "
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Відкриття вікна опцій облікового запису...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Запис%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Налаштування для нового облікового запису"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Налаштування облікового запису"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Створення вікна опцій запису...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Отримання"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Надсилання"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Написання"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Конфіденційність"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "Проксі"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Додатково"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Назва цього запису"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Встановити як головний"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr " Особиста інформація "
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Повне ім'я"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Поштова адреса"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Організація"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr " Інформація про сервер "
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr " POP3 "
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr " IMAP4 "
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr " Новини (NNTP) "
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Нема (локально)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Цей сервер вимагає автентифікації"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Сервер новин"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Сервер для отримання"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Сервер SMTP (відсилання)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "ID користувача"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Пароль"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Використовувати безпечну автентифікацію (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Видаляти листи на сервері після отримання"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Видалити через"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "днів"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 днів - видаляти негайно"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "Завантажити всі листи на сервері (включно із вже отриманими)"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Обмеження розміру отриманих листів"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "КБ"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Фільтрувати листи під час отримання"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Вхідна папка за замовчуванням"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "У цій папці будуть зберігатися невідфільтровані листи."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Метод автентифікації"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "При отриманні перевіряти тільки папку Вхідних"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Фільтрувати нові листи у Вхідних при отриманні"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Новини"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Максимальна кількість статей для завантаження"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Якщо вказано 0, обмежень немає."
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "Перевіряти за командою \"Отримати всі\""
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr " Заголовок "
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Додати поле дати до заголовку"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Генерувати Message-ID"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Додати заголовок користувача"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Редагувати... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr " Автентифікація "
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Автентифікація SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4623,240 +4653,244 @@ msgstr ""
 "Якщо залишити ці поля порожніми, буде використано ті ж ID користувача та "
 "пароль, що й для отримання."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Автентифікація POP3 перед відсиланням"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr " Підпис "
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "Прямий ввід "
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Ім'я:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Вивід команди"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "Вставляти підпис перед цитатою (не рекомендується)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr " Автоматично встановлювати наступні адреси "
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Копія"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Приховано"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Зворотна адреса"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "Підписувати листа ключем PGP за замовчуванням"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "Шифрувати листа ключем PGP за замовчуванням"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Шифрувати відповідь на шифрований лист"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 msgid "Add my own key to the recipients list on encryption"
 msgstr "Додати власний ключ до списку одержувачів після шифрування"
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Використовувати \"ASCII-armored\" формат для шифрування"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Використовувати підпис відкритим текстом"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr "Ключ для підпису / шифрування"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Використовувати ключ GnuPG за замовчуванням"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Обрати ключ за Вашою адресою e-mail"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Визначити ключ власноручно"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Користувач або ідентифікатор ключа:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Не використовувати SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Використовувати SSL для з'єднання POP3"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Використовувати команду STARTTLS для початку сесії SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Використовувати SSL для з'єднання IMAP4"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Використовувати SSL для з'єднання NNTP"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Надсилання (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Використовувати SSL для з'єднання SMTP"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Використовувати неблокуючий SSL"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Вимкніть це, якщо стикаєтеся з проблемами SSL з'єднання."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "Використовувати SOCKS проксі "
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "Ім'я сервера:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "Використовувати автентифікацію"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Ім'я:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "Використовувати SOCKS проксі для надсилання"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Порт SMTP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Порт POP3"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Порт IMAP4"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Порт NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Ім'я домена"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Каталог сервера IMAP"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "Буде показано тільки підкаталоги цього каталогу."
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Прии виході очищати кеш повідомлень"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Зберігати відіслані листи у"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Зберігати чернетки листів у"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Зберігати відкладені листи у"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Зберігати видалені листи у"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Назву запису не вказано."
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Не вказано поштову адресу."
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Не вказано сервер SMTP."
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "Не вказано ID користувача."
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Не вказано сервер POP3."
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Не вказано сервер IMAP4."
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Не вказано сервер NNTP."
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "Вказана папка не є папкою черги."
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/vi.po b/po/vi.po
index 7def1e43..961b81fc 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -29,203 +29,208 @@ msgstr "Lọc thư rác"
 msgid "Junk mail filter"
 msgstr "Lọc thư rác"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Kết nối IMAP4 tới %s đã bị ngắt. Đang kết nối lại...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Máy chủ IMAP4 cấm ĐĂNG NHẬP.\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 #, fuzzy
 msgid "Could not establish IMAP connection.\n"
 msgstr "Không thể tạo phiên IMAP4 với: %s:%d\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "đang tạo kết nối IMAP4 tới %s:%d ...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "Không thể khởi động phiên TLS.\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr ""
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, fuzzy, c-format
 msgid "Getting message %u"
 msgstr "Đang lấy thư %d"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Đang ghép thư vào %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Đang chuyển thư %s tới %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Đang chép thư %s tới %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "Đang xoá thư %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "không thể đặt cờ đã xoá: %s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "không thể xoá\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Xoá mọi thư trong %s"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "không thể đặt cờ đã xoá: 1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "không thể đóng thư mục\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "thư mục gốc %s không tồn tại\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "xảy ra lỗi khi lấy LIST.\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Không thể tạo '%s'\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Không thể tạo '%s' ở INBOX\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "không thể tạo hộp thư: LIST thất bại\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "không thể tạo hộp thư\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "không thể tạo hộp thư\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "không thể đổi tên hộp thư: %s thành %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "không thể xoá hộp thư\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Đang lấy header của thư (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "xảy ra lỗi khi lấy phong bì.\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "không thể phân tích phong bì: %s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "không thể lấy phong bì\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Không thể kết nối tới máy chủ IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Không thể tạo phiên IMAP4 với: %s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "không thể lấy khoảng định danh (namespace)\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "không thể chọn thư mục: %s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "có lỗi khi chạy lệnh imap: STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "Xác thực IMAP4 thất bại:\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "Đăng nhập IMAP4 thất bại.\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "không thể ghep %s vào %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(đang gửi tập tin...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "không thể ghép thư vào %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "không thể chép %s tới %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "có lỗi khi chạy lệnh imap: STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "có lỗi khi chạy lệnh imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "có lỗi khi chạy lệnh imap: CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv không thể chuyển UTF-7 sang %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv không thể chuyển %s sang UTF-7\n"
@@ -500,7 +505,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "có lỗi trong phiên làm việc POP3\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "lỗi khi lưu cấu hình vào tập tin\n"
@@ -552,50 +557,50 @@ msgstr "phản hồi SMTP tồi\n"
 msgid "error occurred on SMTP session\n"
 msgstr "có lỗi trong phiên SMTP\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 không sẵn có\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 hiện có\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 không sẵn có\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 hiện có\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "Phương thức SSL không sẵn có\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Phương thức SSL không xác định *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "Lỗi khi tạo ngữ cảnh ssl\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Kết nối SSL sử dụng %s\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "Máy chủ chứng nhận:\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Tiêu đề: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Người phát hành: %s\n"
@@ -640,7 +645,7 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -679,14 +684,14 @@ msgstr ""
 "trên cột `G' để cho phép lấy thư về bằng `Lấy tất cả'."
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "Tên"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "Giao thức"
 
@@ -814,13 +819,13 @@ msgstr "Đối số người dùng của hành động"
 msgid "Add Address to Book"
 msgstr "Thêm địa chỉ vào sổ"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "Địa chỉ"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Ghi chú"
 
@@ -833,7 +838,7 @@ msgstr "Chọn thư mục sổ địa chỉ"
 msgid "Auto-registered address"
 msgstr "Các mẫu đã đăng kí"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/_Tập tin"
@@ -854,10 +859,10 @@ msgstr "/_Tập tin/_JPilot mới"
 msgid "/_File/New _LDAP Server"
 msgstr "/_Tập tin/_Máy chủ LDAP mới"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/_Tập tin/---"
@@ -874,21 +879,21 @@ msgstr "/_Tập tin/_Xoá"
 msgid "/_File/_Save"
 msgstr "/_Tập tin/_Lưu"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/_Tập tin/Đón_g"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/_Soạn"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/_Soạn/_Sao chép"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/_Soạn/_Dán"
 
@@ -935,7 +940,7 @@ msgstr "/Đị_a chỉ/_Soạn"
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/_Công cụ"
@@ -949,12 +954,12 @@ msgstr "/_Công cụ/_Nhập tập tin LDIF"
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/_Hỗ trợ/_Giới thiệu"
@@ -972,7 +977,7 @@ msgid "/New _Folder"
 msgstr "/Thư _mục mới"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1016,7 +1021,7 @@ msgstr "Sổ địa chỉ"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "Thư mục"
 
@@ -1028,17 +1033,17 @@ msgstr "Địa chỉ email"
 msgid "Search:"
 msgstr "Tìm kiếm:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "Người nhận:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1248,7 +1253,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1304,410 +1309,415 @@ msgstr "Nâu"
 msgid "None"
 msgstr "Không"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/_Mở"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/Thê_m..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/_Xoá bỏ"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/Th_uộc tính"
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/_Tập tin/_Gửi"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/_Tập tin/Gửi _sau"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/_Tập tin/Lưu vào thư mục _nháp"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/_Tập tin/Lưu và _tiếp tục soạn"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/_Tập tin/Đính _kèm tập tin"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/_Tập tin/_Chèn tập tin"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/_Tập tin/Chèn _chữ kí"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/_Tập tin/Thêm _chữ kí"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/_Soạn/_Hoàn tác"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/_Soạn/Ch_uyển tác"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/_Soạn/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/_Soạn/_Cắt"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Soạn/Dán ở dạng t_rích dẫn"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/_Soạn/Chọ_n tất cả"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Soạn/_Khuôn dòng đoạn hiện tại"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Soạn/Khuôn _mọi dòng dài"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Soạn/Tự độ_ng khuôn dòng"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/_Xem"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/_Xem/_Người nhận"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/_Xem/_Cc"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/_Xem/_Bcc"
 
-#: src/compose.c:617
+#: src/compose.c:622
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/_Xem/_Hồi âm cho"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/_Xem/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/_Xem/Tiế_p sau"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/_Xem/_Thước kẻ"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/_Xem/Đí_nh kèm"
 
-#: src/compose.c:625
+#: src/compose.c:630
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/_Xem/Mã _kí tự"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/_Xem/Mã _kí tự/_Tự động"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/_Xem/Mã _kí tự/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Xem/Mã _kí tự/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Xem/Mã _kí tự/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Xem/Mã _kí tự/Tây Âu (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Xem/Mã _kí tự/Tây Âu (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Xem/Mã _kí tự/Trung Âu (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Xem/Mã _kí tự/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Xem/Mã _kí tự/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Xem/Mã _kí tự/A-rập (Windows-1256)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Xem/Mã _kí tự/Hi Lạp (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Xem/Mã _kí tự/A-rập (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Xem/Mã _kí tự/A-rập (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Xem/Mã _kí tự/Do Thái (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Xem/Mã _kí tự/Do Thái (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Xem/Mã _kí tự/Thổ Nhĩ Kì (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Xem/Mã _kí tự/Hán giản thể (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Xem/Mã _kí tự/Triều Tiên (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Xem/Mã _kí tự/Thái (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Xem/Mã _kí tự/Thái (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/_Công cụ/_Sổ địa chỉ"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/_Công cụ/_Mẫu"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/_Công cụ/_Hành động"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/_Công cụ/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Công cụ/Soạ_n với chương trình ngoài"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Công cụ/Chữ _kí PGP"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Công cụ/Mã hoá _PGP"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/_Công cụ/Kiểm tra _chính tả"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/_Công cụ/Chọn ngôn ngữ để _kiểm tra chính tả"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: tập tin không tồn tại\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "Không thể lấy phần văn bản\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "Lỗi định dạng đánh dấu trích dẫn."
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "Lỗi định dạng trả lời/chuyển tiếp thư."
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Không thể xác định kích tước tập tin của %s\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "%s là tập tin trống."
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "Không thể đọc %s."
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "Thư: %s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "Không thể lấy thành phần cho thư nhiều thành phần."
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Viết thư%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "Chữ kí"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "Chưa chỉ định người nhận."
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "Tiêu đề bị bỏ trống"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tiêu đề bị bỏ trống. Vẫn gửi đi?"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "Đính kèm"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Tự động đặt địa chỉ sau"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "Tiêu đề:"
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 #, fuzzy
 msgid "_Send"
 msgstr "Gửi"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "Kiểm tra thư mới trong mọi thư mục..."
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "không lấy được danh sách người nhận."
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1715,42 +1725,42 @@ msgstr ""
 "Chưa xác định tài khoản để gửi thư.\n"
 "Hãy chọn một tài khoản trước khi gửi."
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Xảy ra lỗi khi gửi thư đến %s ."
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr ""
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Không tìm thấy khoá liên quan đến khoá đang chọn với id `%s'."
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "không thể đổi chế độ tập tin\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1761,11 +1771,11 @@ msgstr ""
 "\n"
 "Vẫn gửi ở dạng %s?"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "Lỗi chuyển mã"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1778,15 +1788,15 @@ msgstr ""
 "\n"
 "Vẫn gửi đi?"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1795,96 +1805,106 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Không thể mở tập tin đánh đấu.\n"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 #, fuzzy
 msgid "Data type"
 msgstr "Thời gian"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "Chữ kí"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "Đang kiểm tra chữ kí"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "Tập tin không tồn tại hoặc rỗng."
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 #, fuzzy
 msgid "File not exist."
 msgstr "%s: tập tin không tồn tại\n"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "Đang mở tập tin chạy"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1895,12 +1915,12 @@ msgstr ""
 "Nếu bạn muốn chạy tập tin, lưu nó vào đâu đó và đảm bảo nó không bị nhiễm vi-"
 "rút hay là chương trình có hại."
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Dòng lệnh cho trình soạn thảo ngoài không hợp lệ: `%s'\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1909,48 +1929,48 @@ msgstr ""
 "Trình soạn thảo ngoài vẫn đang hoạt động.\n"
 "Bắt buộc dừng tiến trình (pid: %d)?\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Nội dung đã được thay đổi. Lưu vào thư mục nháp?"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Bạn có muốn dùng mẫu `%s' ?"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -1991,7 +2011,7 @@ msgid "Nick Name"
 msgstr "Biệt danh"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Địa chỉ email"
 
@@ -2050,7 +2070,7 @@ msgid " Check File "
 msgstr " Kiểm tra tập tin "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "Tập tin"
 
@@ -2059,62 +2079,62 @@ msgstr "Tập tin"
 msgid "Add New Address Book"
 msgstr "Thêm Sổ địa chỉ mới"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "Phải cung cấp một tên nhóm"
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "Soạn dữ liệu cho nhóm"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "Tên nhóm"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "Các địa chỉ hiện có"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "Các địa chỉ trong nhóm"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "Chuyển địa chỉ email tới hoặc từ nhóm với nút mũi tên"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "Soạn thông tin về nhóm"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "Thêm nhóm mới"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "Sửa thư mục"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "Đặt tên mới cho thư mục:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "Thư mục mới"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "Đặt tên cho thư mục mới:"
 
@@ -2131,7 +2151,7 @@ msgid "Edit JPilot Entry"
 msgstr "Soạn mục JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2196,7 +2216,7 @@ msgstr "Hết hạn (giây)"
 msgid "Maximum Entries"
 msgstr "Số mục tối đa"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "Cơ bản"
 
@@ -2288,7 +2308,7 @@ msgid "MH (number only)"
 msgstr ""
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr "Chọn... "
 
@@ -2479,12 +2499,12 @@ msgstr "Thiết lập thông tin thư mục...\n"
 msgid "Setting folder info..."
 msgstr "Thiết lập thông tin thư mục..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Đang quét thư mục %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Đang quét thư mục %s ..."
@@ -3331,699 +3351,709 @@ msgstr ""
 "Tìm thấy phiên bản trước của cấu hình.\n"
 "Bạn có muốn di trú nó không?"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/_Tập tin/_Thư mục"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Tập tin/_Thư mục/_Tạo thư mục mới..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Tập tin/_Thư mục/Đổi tê_n thư mục..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Tập tin/_Thư mục/_Di chuyển thư mục"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Tập tin/_Thư mục/_Xoá thư mục"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/_Tập tin/_Hộp thư"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Tập tin/_Hộp thư/_Thêm hộp thư..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Tập tin/_Hộp thư/_Xoá hộp thư"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/_Tập tin/_Hộp thư/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Tập tin/_Hộp thư/_Kiểm tra thư mới"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Tập tin/_Hộp thư/Kiể_m tra thư mới ở mọi hộp thư"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Tập tin/_Hộp thư/_Làm lại cây thư mục"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 #, fuzzy
 msgid "/_File/_Import mail data..."
 msgstr "/_Tập tin/_Nhập khẩu tập tin mbox..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_File/_Export mail data..."
 msgstr "/_Tập tin/_Xuất khẩu tập tin mbox..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/_Tập tin/Đổ _rác"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/_Tập tin/_Lưu là..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Tập tin/_Lưu là..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/_Tập tin/I_n..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/_Tập tin/Làm _việc ngoại tuyến"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/_Tập tin/Th_oát"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/_Soạn/_Chọn luồng"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Soạn/_Tìm trong thư hiện tại..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/_Soạn/Tìm _kiếm thư..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 #, fuzzy
 msgid "/_Edit/_Quick search"
 msgstr "/_Soạn/_Dán"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/_Xem/_Hiện hoặc ẩn"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Cây thư mục"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Khung xem thư"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/Biểu tượng _và nhãn"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Biểu tượng"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Biểu tượng"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Nhãn"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Không"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Xem/_Hiện hoặc ẩn/T_hanh tìm kiếm"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Xem/_Hiện hoặc ẩn/T_hanh trạng thái"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 #, fuzzy
 msgid "/_View/Layou_t"
 msgstr "/_Xem/_Sắp xếp"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 #, fuzzy
 msgid "/_View/Layou_t/_Normal"
 msgstr "/_Xem/_Sắp xếp/theo người _gửi"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr ""
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/_Xem/_Cây thư mục riêng rẽ"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/_Xem/_Khung xem thư riêng rẽ"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/_Xem/_Sắp xếp"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/_Xem/_Sắp xếp/theo _số"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Xem/_Sắp xếp/theo _kích thước"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/_Xem/_Sắp xếp/th_eo thời gian"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Xem/_Sắp xếp/th_eo thời gian của luồng"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/_Xem/_Sắp xếp/theo người _gửi"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Xem/_Sắp xếp/theo người _nhận"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Xem/_Sắp xếp/theo tiê_u đề"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Xem/_Sắp xếp/theo nhãn _màu"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Xem/_Sắp xếp/theo đánh _dấu"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Xem/_Sắp xếp/theo _chưa đọc"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Xem/_Sắp xếp/theo đín_h kèm"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Xem/_Sắp xếp/Không sắp _xếp"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/_Xem/_Sắp xếp/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Xem/_Sắp xếp/_Tăng dần"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/_Xem/_Sắp xếp/_Giảm dần"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Xem/_Sắp xếp/Tập t_rung theo tiêu đề"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/_Xem/_Xem theo luồng"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/_Xem/Mở mọi l_uồng"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Xem/Đón_g mọi luồng"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/_Xem/Chọ_n mục hiển thị..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/_Xem/Đi _tới"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Xem/Đi _tới/Thư _trước"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Xem/Đi _tới/Thư tiế_p theo"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/_Xem/Đi _tới/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Xem/Đi _tới/Thư trước (_chưa đọc)"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Xem/Đi _tới/Thư tiếp theo (chư_a đọc)"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Xem/Đi _tới/Thư trước (_mới)"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Xem/Đi _tới/T_hư tiếp theo (mới)"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Xem/Đi _tới/Thư trước (đánh _dấu)"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Xem/Đi _tới/Thư tiếp the_o (đánh dấu)"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Xem/Đi _tới/Thư trước (đã _gán nhãn)"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Xem/Đi _tới/Thư tiếp th_eo (đã gán nhãn)"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Xem/Mã _kí tự/_Tự động xác định"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Xem/Mã _kí tự/Đông Âu (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Xem/Mã _kí tự/Hán (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Xem/Mã _kí tự/Triều Tiên (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/_Xem/_Mở trong cửa sổ mới"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/_Xem/_Nguồn thư"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Xem/Mọi _header"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/_Xem/_Cập nhật tóm tắt"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/_Thư"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/_Thư/_Nhận"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Thư/_Nhận/_Từ tài khoản mặc định"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Thư/_Nhận/Từ _mọi tài khoản"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Thư/_Nhận/_Huỷ bỏ việc lấy thư"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/_Thư/_Nhận/Từ _mọi tài khoản"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Thư/_Nhận/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/_Thư/_Nhận/_Gửi thư đang xếp hàng"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Thư/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/_Thư/_Viết thư mới"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/_Thư/_Hồi âm"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/_Thư/Hồi â_m tới"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Thư/Hồi â_m tới/_tất cả"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Thư/Hồi â_m tới/_người gửi"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Thư/Hồi â_m tới/_hộp thư chung"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/_Thư/_Chuyển tiếp"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Thư/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/_Thư/Chu_yển hướng"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/_Thư/_Di chuyển..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/_Thư/_Sao chép"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/_Thư/Đánh _dấu"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 #, fuzzy
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/_Thư/Đánh _dấu/Đánh _dấu"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/_Thư/Đánh _dấu/_Bỏ đánh dấu"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/_Thư/Đánh _dấu/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Thư/Đánh _dấu/C_hưa đọc"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Thư/Đánh _dấu/Đã đọ_c"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Thư/Đánh _dấu/Luồng đã được đọ_c"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Thư/Đánh _dấu/Đã đọc _tất cả"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/_Thư/_Xoá"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Thư/Đánh dấu là thư _rác"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Thư/Đánh dấu _không là thư rác"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/_Thư/S_oạn lại"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Công cụ/_Thêm người gửi vào sổ địa chỉ..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Công cụ/_Lọc mọi thư trong thư mục"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Công cụ/Lọ_c các thư đã chọn"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Công cụ/Tạo _quy tắc lọc"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/_Tự động"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo _Người gửi"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo N_gười nhận"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo Tiê_u đề"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Công cụ/Lọc _thư rác trong thư mục"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Công cụ/Lọc thư _rác trong các thư đã chọn"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Công cụ/_Xoá thư trùng"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 #, fuzzy
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/_Công cụ/_Xoá thư trùng"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Chạy tiến trình đã đánh dấu"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/_Công cụ/Lọc _thư rác trong thư mục"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/_Công cụ/_Lọc mọi thư trong thư mục"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/_Công cụ/Cửa sổ theo _dõi"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/Cấ_u hình"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Cấ_u hình/_Cấu hình chung..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 #, fuzzy
 msgid "/_Configuration/_Filter settings..."
 msgstr "/Cấ_u hình/_Thiết lập bộ lọc..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/Cấ_u hình/_Mẫu..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/Cấ_u hình/_Hành động..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 #, fuzzy
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/Cấ_u hình/_Mẫu..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/Cấ_u hình/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Cấ_u hình/Cấ_u hình cho tài khoản mặc định..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/Cấ_u hình/Tạ_o tài khoản mới..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Cấ_u hình/_Sửa tài khoản..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/Cấ_u hình/Đổi tài _khoản mặc định"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/_Hỗ trợ/_Sổ tay hướng dẫn"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hỗ trợ/_Sổ tay hướng dẫn/Tiếng _Anh"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hỗ trợ/_Sổ tay hướng dẫn/Tiếng _Nhật"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/Tiếng _Anh"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/Tiếng Đứ_c"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/Tiếng _Tây Ban Nha"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/Tiếng _Pháp"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/_Tiếng Italia"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Hỗ trợ/Tuỳ chọn _dòng lệnh"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/_Hỗ trợ/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr ""
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr ""
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "Đang tạo cửa sổ chính...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Cửa sổ chính: việc cấp màu %d thất bại\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "xong.\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "Chưa đặt tên"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "không"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "Ngoại tuyến"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "Bạn đang ngoại tuyến. Chuyển sang trực tuyến?"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "Đổ mọi thùng rác"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "Thêm hộp thư"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -4033,16 +4063,16 @@ msgstr ""
 "Nếu hộp thư có trước được chỉ định, nó sẽ được\n"
 "tự động quét."
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Hộp thư `%s' đã có trước."
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "Hộp thư"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4051,99 +4081,99 @@ msgstr ""
 "Việc tạo hộp thư đã thất bại.\n"
 "Có thể một số tập tin đã có trước, hoặc bạn không có quyền ghi lên đó."
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Khung thư mục"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Khung đọc thư"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/_Hồi âm"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/Hồi âm _tất cả"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/Hồi âm cho người _gửi"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/Hồi âm cho _hộp thư chung"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/_Chuyển tiếp"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/Chu_yển hướng"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr ""
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 #, fuzzy
 msgid "Text at the _right of icon"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Biểu tượng"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr ""
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 #, fuzzy
 msgid "_Text"
 msgstr "Văn bản"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 #, fuzzy
 msgid "_None"
 msgstr "Không"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "Bạn đang ngoại tuyến. Nhấn vào biểu tượng để chuyển sang trực tuyến."
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "Bạn đang trực tuyến. Nhấn vào biểu tượng để chuyển sang ngoại tuyến."
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "Thoát"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "Thoát chương trình này?"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Chọn thư mục"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "Tuỳ chọn dòng lệnh"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Cách dùng: sylpheed [TUỲ CHỌN]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4175,7 +4205,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4207,15 +4237,15 @@ msgstr ""
 "hiện thông tin trợ giúp này và thoát\n"
 "đưa ra thông tin phiên bản và thoát"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4458,238 +4488,238 @@ msgstr "Tập tin"
 msgid "Description: "
 msgstr "Miêu tả"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "Đang mở cửa sổ cấu hình tài khoản...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "Tài khoản %d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "Cấu hình cho tài khoản mới"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "Cấu hình tài khoản"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "Đang tạo của sổ cấu hình tài khoản...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "Nhận"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "Gửi"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "Viết thư"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "Riêng tư"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "Tên của tài khoản này"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "Đặt là mặc định"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "Thông tin cá nhân"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "Tên đầy đủ"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "Địa chỉ thư"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "Thông tin máy chủ"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "Tin tức (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "Không (nội bộ)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "Máy chủ này yêu cầu xác thực"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "Máy chủ tin tức"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "Máy chủ nhận"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "Máy chủ SMTP (gửi)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "ID người dùng"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "Dùng xác thực bảo mật (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "Xoá thư khỏi máy chủ sau khi nhận"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "Xoá sau"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "ngày"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 ngày: xoá ngay lập tức"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "Tải mọi thư trên máy chủ"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "Giới hạn kích thước khi nhận"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "Lọc thư khi nhận"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "Hộp nhận mặc định"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Thư chưa lọc sẽ được lưu vào thư mục này."
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "Phương thức xác thực"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "Tự động"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "Chỉ kiểm tra Hộp nhận khi nhận"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 #, fuzzy
 msgid "Filter new messages in INBOX on receiving"
 msgstr "Lọc thư khi nhận"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "Tin tức"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "Số bài tải về tối đa"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "Không giới hạn nếu ghi là 0"
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Lấy tất' sẽ kiểm tra các thư mới của tài khoản này"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Header"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "Thêm trường Ngày tháng cho header"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "Tạo ID của thư"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "Thêm header theo định nghĩa người dùng"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " Soạn... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "Xác thực"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Xác thực SMTP (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
@@ -4697,248 +4727,252 @@ msgstr ""
 "Nếu bạn bỏ trống các mục này, chương trình sẽ dùng ID người dùng và mật khẩu "
 "này khi nhận."
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "Xác thực với POP3 trước khi gửi"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "Chữ kí"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "Tên:"
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "Đầu ra của lệnh"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Tự động đặt địa chỉ sau"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "Cc"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "Bcc"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "Hồi âm cho"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 #, fuzzy
 msgid "PGP sign message by default"
 msgstr "Kí tên theo mặc định"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 #, fuzzy
 msgid "PGP encrypt message by default"
 msgstr "Mã hoá thư theo mặc định"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "Mã hoá khi trả lời thư mã hoá"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "không lấy được danh sách người nhận."
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "Dùng định dạng ASCII-armored để mã hoá"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "Dùng chữ kí là văn bản thuần tuý"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "Dùng khoá GnuPG mặc định"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "Chọn khoá theo địa chỉ thư của bạn"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "Chỉ định khoá theo cách thủ công"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "Người dùng hoặc ID của khoá:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "Không dùng SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "Dùng SSL cho kết nối POP3"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Dùng lệnh STARTTLS để khởi động phiên SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "Dùng SSL cho kết nối IMAP4"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "Dùng SSL cho kết nối NNTP"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "Gửi (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "Dùng SSL cho kết nối SMTP"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "Dùng SSL dạng không chặn"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "Tắt nếu bạn có vấn đề với kết nối SSL."
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 #, fuzzy
 msgid "Hostname:"
 msgstr "Tên host"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 #, fuzzy
 msgid "Port:"
 msgstr "Cổng"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 #, fuzzy
 msgid "Use authentication"
 msgstr "Xác thực"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "Tên:"
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 #, fuzzy
 msgid "Password:"
 msgstr "Mật khẩu"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 #, fuzzy
 msgid "Use SOCKS proxy on sending"
 msgstr "Dùng chương trình ngoài để gửi"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "Chỉ định cổng STMP"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "Chỉ định cổng POP3"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "Chỉ định cổng IMAP4"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "Chỉ định cổng NNTP"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "Chỉ định tên miền"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "Thư mục máy chủ IMAP"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "Xoá mọi thư trên bộ nhớ đệm khi thoát"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "Chuyển thư đã gửi vào"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "Chuyển thư nháp vào"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "Chuyển thư đang đợi gửi vào"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "Chuyển thư đã xoá vào"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "Tên tài khoản chưa được nhập"
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "Địa chỉ thư chưa được nhập"
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "Máy chủ SMTP chưa được nhập"
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "ID người dùng chưa được nhập"
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "Máy chủ POP3 chưa được nhập"
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "Máy chủ IMAP4 chưa được nhập"
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "Máy chủ NNTP chưa được nhập"
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ac4d4d58..afd5a392 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: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2013-05-05 15:15+0800\n"
 "Last-Translator: Careone <emacs-locale@qq.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -32,202 +32,207 @@ msgstr "垃圾邮件过滤器(手动)"
 msgid "Junk mail filter"
 msgstr "垃圾邮件过滤器"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "到 %s 的 IMAP4 连接已断开。正在重新连接...\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 服务器禁止登录。\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "无法创建 IMAP 连接。\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "正在创建到 %s:%d 的 IMAP4 连接...\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "无法启动 TLS 会话。\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(收取 FLAGS...)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "收取邮件 %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "添加邮件到 %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "移动邮件 %s 到 %s ..."
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "复制邮件 %s 到 %s ..."
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "删除邮件 %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "无法设置删除 flags 标定：%s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "无法清除\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "移除 %s 中的全部邮件"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "无法设置删除标志：1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "无法关闭文件夹\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "根文件夹 %s 不存在\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "获取列表时发生错误。\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "无法创建“%s”\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "无法在收件箱中创建%s\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "无法创建邮箱：LIST 失败\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "无法创建邮箱\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "无法创建邮箱\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "无法将邮箱 %s 重命名为 %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "无法删除邮箱\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "获取信封时发生错误。\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "无法解析信封：%s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "无法获取信封\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到 IMAP4 服务器：%s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "无法用以下方式创建 IMAP4 会话：%s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "无法获得名字空间\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "无法选择文件夹：%s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 验证失败。\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登录失败。\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "无法把 %s 添加到 %s\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "(正在发送文件...)"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "无法追加邮件到 %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "无法复制 %s 到 %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "执行IMAP命令时发生错误：STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "执行IMAP命令时发生错误：EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv 无法转换 UTF-7 到 %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 无法转换 %s 到 UTF-7\n"
@@ -503,7 +508,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "POP3 会话发生错误\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "无法写入配置文件\n"
@@ -555,50 +560,50 @@ msgstr "错误的 SMTP 回应\n"
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP 会话发生错误\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 不可用\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "SSLv23 可用\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 不可用\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "TLSv1 可用\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "SSL 方法不可用\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "不知道的SSL方法 *程序错误*\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "创建 SSL 上下文时发生错误\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "使用 %s 的 SSL 连接\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "服务器证书：\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  主题: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  签发者: %s\n"
@@ -654,7 +659,7 @@ msgstr ""
 "Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA "
 "02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -691,14 +696,14 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "名称"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "协议"
 
@@ -826,13 +831,13 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "地址"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "注释"
 
@@ -844,7 +849,7 @@ msgstr "选择地址簿文件夹"
 msgid "Auto-registered address"
 msgstr "自动记录的地址"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -865,10 +870,10 @@ msgstr "/文件(_F)/新建 _JPilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建 _LDAP 服务器"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
@@ -885,21 +890,21 @@ msgstr "/文件(_F)/删除(_D)"
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
@@ -943,7 +948,7 @@ msgstr "/地址(_A)/编辑(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -956,12 +961,12 @@ msgstr "/工具(_T)/导入 _LDIF 文件"
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/导入 _CSV 文件"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
@@ -979,7 +984,7 @@ msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1021,7 +1026,7 @@ msgstr "地址簿"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "文件夹"
 
@@ -1033,17 +1038,17 @@ msgstr "电子邮件地址"
 msgid "Search:"
 msgstr "搜索:"
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "收件人:"
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "抄送:"
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "密送:"
@@ -1244,7 +1249,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "注意"
 
@@ -1300,392 +1305,397 @@ msgstr "棕色"
 msgid "None"
 msgstr "没有"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/打开(_O)"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/添加(_A)..."
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/文件(_F)/发送(_S)"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/文件(_F)/以后发送(_L)"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/文件(_F)/保存到草稿文件夹(_D)"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/文件(_F)/保存并继续编辑(_K)"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/文件(_F)/添加附件(_A)"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/文件(_F)/插入文件(_I)"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/文件(_F)/插入签名(_G)"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/文件(_F)/添加签名(_P)"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤销(_U)"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复(_R)"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_T)"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引文粘贴(_Q)"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_A)"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/当前段落折行(_W)"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/所有长行折行(_L)"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/查看(_V)"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/查看(_V)/收件人(_T)"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/查看(_V)/抄送(_C)"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/查看(_V)/密件抄送(_B)"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/查看(_V)/回复至(_R)"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/查看(_V)/跟进到(_F)"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/查看(_V)/标尺(_U)"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/查看(_V)/附件(_A)"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/查看(_V)/自定义工具栏(_S)..."
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/查看(_V)/字符编码(_E)/自动(_A)"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_E)/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符编码(_E)/7位 ASCII (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符编码(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符编码(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-13)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/查看(_V)/字符编码(_E)/阿拉伯语 (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/查看(_V)/字符编码(_E)/阿拉伯语 (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符编码(_E)/希伯来语 (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符编码(_E)/希伯来语 (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符编码(_E)/土耳其语 (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符编码(_E)/泰语 (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰语 (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/用外部编辑器编辑(_X)"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/工具(_T)/请求安排通知(_D)"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/工具(_T)/检查拼写(_C)"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/设置拼写语言(_S)"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "无法获得多段邮件的分块。"
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "(未填主题)"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 写信%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "签名"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "主题空白"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "附件丢失"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "目前没有附件。不带附件进行发送？"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "检查收件人"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "确定发送本邮件到以下地址？"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "发件人:"
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "主题："
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
@@ -1693,11 +1703,11 @@ msgstr ""
 "现在正在检查新邮件。\n"
 "请稍后重试。"
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1705,39 +1715,39 @@ msgstr ""
 "没有指定发送邮件时使用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr "邮件发送完成，但是邮件无法保存到发件箱。"
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”有关的钥匙。"
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "无法对这封邮件进行签名。"
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "无法加密这封邮件。"
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "无法加密或对这封邮件进行签名。"
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1748,11 +1758,11 @@ msgstr ""
 "\n"
 "仍然以 %s 发送吗？"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "代码转换错误"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1765,15 +1775,15 @@ msgstr ""
 "\n"
 "仍然要发送吗？"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "行宽限制"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "以加密方式进行密送"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1786,94 +1796,104 @@ msgstr ""
 "\n"
 "仍然要发送吗？"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "文件 %s 不存在。"
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "无法打开文件 %s。"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "正在创建写信窗口...\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "PGP 签名"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "日期类型"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "签名"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "检查签名"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "无效的 MIME 类型。"
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "文件不存在。"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "打开可执行文件"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1884,12 +1904,12 @@ msgstr ""
 "如果你打算启动它，请把它保存到某个位置，并确认它并不是一个病毒或者类似的恶意"
 "程序。"
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1898,48 +1918,48 @@ msgstr ""
 "外部编辑器仍在工作。\n"
 "强制结束程序 (pid: %d)？\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "自定义工具栏(_C)..."
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "选择多个文件"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "保存邮件"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "邮件已修改。保存到草稿文件夹？"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "不保存并关闭(_W)"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "应用模板"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -1980,7 +2000,7 @@ msgid "Nick Name"
 msgstr "昵称"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "电子邮件地址"
 
@@ -2038,7 +2058,7 @@ msgid " Check File "
 msgstr " 检查文件 "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "文件"
 
@@ -2046,62 +2066,62 @@ msgstr "文件"
 msgid "Add New Address Book"
 msgstr "添加新地址簿"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "必须提供群组名。"
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "编辑群组信息"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "群组名"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "可用邮件地址"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  ->  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  <-  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "群组中的地址"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "用箭头按钮将电子邮件地址移入和移出群组"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "编辑群组详细信息"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "添加新群组"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "编辑文件夹"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "输入新的文件夹名称:"
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名称:"
 
@@ -2118,7 +2138,7 @@ msgid "Edit JPilot Entry"
 msgstr "编辑 JPilot 项"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr " ... "
@@ -2183,7 +2203,7 @@ msgstr "超时(秒)"
 msgid "Maximum Entries"
 msgstr "最大项数"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "基本"
 
@@ -2269,7 +2289,7 @@ msgid "MH (number only)"
 msgstr "MH(纯数字)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr " 选择... "
 
@@ -2451,12 +2471,12 @@ msgstr "设置文件夹信息...\n"
 msgid "Setting folder info..."
 msgstr "设置文件夹信息..."
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "扫描文件夹 %s ..."
@@ -3271,683 +3291,693 @@ msgstr ""
 "发现以前版本的配置。\n"
 "您要迁移吗？"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/文件(_F)/文件夹(_F)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/文件(_F)/文件夹(_F)/新建文件夹(_N)..."
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/文件(_F)/文件夹(_F)/重命名文件夹(_R)..."
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/文件(_F)/文件夹(_F)/移动文件夹(_M)..."
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/文件(_F)/文件夹(_F)/删除文件夹(_D)"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/文件(_F)/邮箱(_M)"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/文件(_F)/邮箱(_M)/添加邮箱(_M)..."
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/文件(_F)/邮箱(_M)/删除邮箱(_R)..."
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/文件(_F)/邮箱(_M)/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/文件(_F)/邮箱(_M)/检查新邮件(_C)"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/文件(_F)/邮箱(_M)/检查所有邮箱的新邮件(_A)"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/文件(_F)/邮箱(_M)/重建文件夹树(_E)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/文件(_F)/导入邮件数据(_I)..."
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/文件(_F)/导出邮件数据(_E)..."
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/文件(_F)/清空全部废件箱(_T)"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/文件(_F)/另存为(_S)..."
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/文件(_F)/页面设置(_U)..."
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/文件(_F)/打印(_P)..."
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/文件(_F)/离线工作(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/文件(_F)/离开(_X)"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/编辑(_E)/选择线索(_T)"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/编辑(_E)/在当前邮件中查找(_F)..."
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/编辑(_E)/搜索邮件(_S)..."
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/编辑(_E)/快速搜索(_Q)"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/查看(_V)/显示或隐藏(_D)"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/查看(_V)/显示或隐藏(_D)/文件夹树(_F)"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/查看(_V)/显示或隐藏(_D)/邮件视图(_M)"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标和文字(_A)"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/左图标右文字(_R)"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标(_I)"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/文字(_T)"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/无(_N)"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/查看(_V)/显示或隐藏(_D)/搜索栏(_S)"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/查看(_V)/显示或隐藏(_D)/状态栏(_B)"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/查看(_V)/自定义工具栏(_C)..."
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/查看/布局(_T)"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/查看(_V)/布局(_T)/常规(_N)"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/查看(_V)/布局(_T)/竖式(_V)"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/查看(_V)/分离文件夹树窗口(_O)"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/查看(_V)/分离邮件视图窗口(_M)"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/查看/排序(_S)"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/查看(_V)/排序(_S)/按序号(_N)"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/查看(_V)/排序(_S)/按大小(_I)"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/查看(_V)/排序(_S)/按主题日期(_D)"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/查看(_V)/排序(_S)/按发件人(_F)"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/查看(_V)/排序(_S)/按收件人(_R)"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/查看(_V)/排序(_S)/按主题(_S)"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/查看(_V)/排序(_S)/按颜色标签(_C)"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/查看(_V)/排序(_S)/按标记(_M)"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/查看(_V)/排序(_S)/按未读(_U)"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/查看(_V)/排序(_S)/按附件(_T)"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/查看(_V)/排序(_S)/不排序(_O)"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/查看(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/查看(_V)/排序(_S)/升序"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/查看(_V)/排序(_S)/降序"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/查看(_V)/排序(_S)/按主题集中(_A)"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/查看(_V)/按线索查看(_R)"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/查看(_V)/展开所有线索(_X)"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/查看(_V)/折叠所有线索(_L)"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/查看(_V)/设置显示项(_I)..."
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/查看(_V)/转到(_G)"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/查看(_V)/转到(_G)/上一个邮件(_P)"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/查看(_V)/转到(_G)/下一个邮件(_N)"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/查看(_V)/转到(_G)/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/查看(_V)/转到(_G)/上一个未读邮件(_R)"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/查看(_V)/转到(_G)/下一个未读邮件(_E)"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/查看(_V)/转到(_G)/上一个新邮件(_W)"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/查看(_V)/转到(_G)/下一个新邮件(_X)"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/查看(_V)/转到(_G)/上一个标记的邮件(_M)"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/查看(_V)/转到(_G)/下一个标记的邮件(_A)"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/查看(_V)/转到(_G)/上一个带标签的邮件(_L)"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/查看(_V)/转到(_G)/下一个带标签的邮件(_B)"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/查看(_V)/字符编码(_E)/自动检测(_A)"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/查看(_V)/字符编码(_E)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_W)"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_A)"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/查看(_V)/所有标题(_H)"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新摘要(_U)"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/邮件(_M)"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/邮件(_M)/接收(_V)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/邮件(_M)/接收(_V)/收取当前帐号(_C)"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/邮件(_M)/接收(_V)/收取所有帐号(_A)"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/邮件(_M)/接收(_V)/停止接收(_G)"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/邮件(_M)/接收(_V)/远程邮箱(_R)..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/邮件(_M)/接收(_V)/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/邮件(_M)/发送队列中的邮件(_S)"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/邮件(_M)/写新邮件(_N)"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回复(_R)"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回复到(_Y)"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回复到(_Y)/所有人(_A)"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回复到(_Y)/发件人(_S)"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回复到(_Y)/邮件列表(_L)"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/邮件(_M)/作为附件转发(_W)"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/邮件(_M)/重定向(_T)"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/邮件(_M)/移动(_O)..."
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/邮件(_M)/复制(_C)..."
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/邮件(_M)/标记(_M)"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/邮件(_M)/标记(_M)/Flag 标定(_F)"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/邮件(_M)/标记(_M)/取消 Flag 标定(_U)"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/邮件(_M)/标记(_M)/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/邮件(_M)/标记(_M)/标记为未读(_E)"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_D)"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/邮件(_M)/标记(_M)/标记线索为已读(_T)"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/邮件(_M)/标记(_M)/全部标记为已读(_R)"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/邮件(_M)/删除(_D)"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/邮件(_M)/设为垃圾邮件(_J)"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/邮件(_M)/设为非垃圾邮件(_U)"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_E)"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/工具(_T)/将发件人添加到地址簿中(_K)"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动(_A)"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/按发件人(_F)"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/按收件人(_T)"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/按主题(_S)"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/工具(_T)/过滤文件夹中的垃圾邮件(_J)"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/工具(_T)/过滤所选邮件中的垃圾邮件(_M)"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/删除重复的邮件(_P)"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/工具(_T)/串联相关的邮件(_O)"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/工具(_T)/执行标记的处理(_X)"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/工具(_T)/过滤文件夹中的垃圾邮件(_J)"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/日志窗口(_L)"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/配置(_C)"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/配置(_C)/通用首选项(_C)..."
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/配置(_C)/过滤设置(_F)..."
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/配置(_C)/模板(_T)..."
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/配置(_C)/动作(_A)..."
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/配置(_C)/插件管理器(_M)..."
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/配置(_C)/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/配置(_C)/当前帐号首选项(_P)..."
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/配置(_C)/创建新帐号(_N)..."
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/配置(_C)/编辑帐号(_E)..."
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/配置(_C)/改变当前帐号(_H)"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/帮助(_H)/手册(_M)"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/帮助(_H)/手册(_M)/英语(_E)"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/帮助(_H)/手册(_M)/日语(_J)"
 
 # ## add end ###
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/帮助(_H)/常见问题(_F)"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/帮助(_H)/常见问题(_F)/英语(_E)"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/帮助(_H)/常见问题(_F)/德语(_G)"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/帮助(_H)/常见问题(_F)/西班牙语(_S)"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/帮助(_H)/常见问题(_F)/法语(_F)"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/帮助(_H)/常见问题(_F)/意大利语(_I)"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/_Help/命令行选项(_C)"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/帮助(_H)/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/帮助(_H)/检查更新(_U)..."
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/帮助(_H)/检查插件更新(_P)..."
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "创建主窗口...\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "无标题"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "无"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "离线"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "你处于离线状态。切换到在线状态吗？"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "清空所有废件箱"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "添加邮箱"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3957,16 +3987,16 @@ msgstr ""
 "如果指定了已存在的邮箱，\n"
 "它将被自动扫描。"
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3975,95 +4005,95 @@ msgstr ""
 "创建邮件箱失败。\n"
 "也许某些文件已经存在，或者你没有写权限。"
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 文件夹视图"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 邮件视图"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/回复到所有人(_A)"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/回复到发件人(_S)"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "图标和文字(_A)"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "左图标右文本(_R)"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "图标(_I)"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "文本(_T)"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "无(_N)"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "您处于离线状态。单击图标切换到在线状态。"
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "您处于在线状态。单击图标切换到离线状态。"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "离开"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "离开本程序吗？"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "选中的邮件无法合并汇总。"
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "选择要打开的文件夹"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "命令行选项"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法: sylpheed [选项]..."
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4097,7 +4127,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4131,15 +4161,15 @@ msgstr ""
 "显示帮助信息并退出\n"
 "输出版本信息并退出"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Windows 相关选项:"
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport 端口号"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "为 IPC 远程命令指定端口"
 
@@ -4373,476 +4403,480 @@ msgstr "文件:"
 msgid "Description: "
 msgstr "描述:"
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "正在打开帐号首选项窗口...\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "帐号%d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "新帐号的首选项"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "帐号首选项"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "正在创建帐号首选项窗口...\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "发送"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "写信"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "代理 "
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "高级"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "帐号名称"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "设置为默认帐号"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "个人资料"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "邮件地址"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "组织"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "服务器资料"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "新闻 (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "无(本地)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "该服务器需要验证"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "新闻组服务器"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "接收服务器"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "SMTP 服务器(发送)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "用户 ID"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "密码"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "使用安全验证 (APOP)"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "收到邮件后从服务器上删除"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "在...以后删除"
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "天"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 天：立即删除"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "下载服务器上的所有邮件"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "接收大小限制"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "在接收邮件时进行过滤"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "默认收件箱"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(没有过滤的邮件会保存在该文件夹中)"
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "验证方式"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "自动"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "仅在接收时检查收件箱"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "在接收邮件时对新邮件进行过滤"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "新闻"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "下载文章的最大数量"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "如果指定值为0，则没有限制。"
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "“全部接收”时检查该帐号的新邮件"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "标题"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "添加日期标题字段"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "生成邮件标识"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "添加用户定义的头域"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " 编辑... "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "验证"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 验证(SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "如果您不填这些项，将使用和接收邮件相同的用户名和口令。"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "发送前用POP3验证"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "签名"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "直接输入"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "姓名："
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "命令输出"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "把签名放在引用前面(不推荐)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "自动设置以下地址"
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "抄送"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "密送"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "回复至"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "默认对邮件进行 PGP 签名"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "默认对邮件进行 PGP 加密"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "回复加密邮件时使用加密"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "无法获得收件人列表。"
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "使用 ASCII 包裹格式进行加密"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "使用明文签名"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "使用默认的 GnuPG 密钥"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "按照邮件地址选择密钥"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "手动指定密钥"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "用户或者密钥 ID:"
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "不使用 SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "使用 SSL 连接 POP3 服务器"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "使用 STARTTLS 命令开始 SSL 会话"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "使用 SSL 连接 IMAP4 服务器"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "使用 SSL 连接 NNTP 服务器"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "发送(SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "使用 SSL 连接 SMTP 服务器"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "使用非阻塞式 SSL"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "如果使用 SSL 连接时出现问题，请关闭本选项。"
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "使用 SOCKS 代理服务器"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "主机名:"
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "端口:"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "验证"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "姓名："
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "密码:"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "使用外部程序发送"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "指定 SMTP 端口"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "指定 POP3 端口"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "指定 IMAP4 端口"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "指定 NNTP 端口"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "指定域名"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP 服务器目录"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "只显示这个目录的子目录。"
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "下载服务器上的所有邮件"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "将已发送的邮件放到"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "将邮件草稿保存于"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "将已列队的邮件放到"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "将已删除的邮件放到"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "没有输入帐号名称。"
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "没有输入邮件地址。"
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "没有输入 SMTP 服务器。"
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "没有输入用户标识。"
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "没有输入 POP3 服务器。"
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "没有输入 IMAP4 服务器。"
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "没有输入 NNTP 服务器。"
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "指定的文件夹不是一个队列文件夹。"
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d5a7bfbe..54a00da5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 13:53+0900\n"
+"POT-Creation-Date: 2017-02-20 13:51+0900\n"
 "PO-Revision-Date: 2011-08-13 16:46+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -31,202 +31,207 @@ msgstr "垃圾郵件過濾器 (手動)"
 msgid "Junk mail filter"
 msgstr "垃圾郵件資料夾"
 
-#: libsylph/imap.c:564
+#: libsylph/imap.c:566
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "到 %s 的 IMAP4 連線被中斷了。重新連線中…\n"
 
-#: libsylph/imap.c:621 libsylph/imap.c:627
+#: libsylph/imap.c:623 libsylph/imap.c:629
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 伺服器停用登入。\n"
 
-#: libsylph/imap.c:686
+#: libsylph/imap.c:688
 msgid "Could not establish IMAP connection.\n"
 msgstr "無法建立 IMAP 連接。\n"
 
-#: libsylph/imap.c:705
+#: libsylph/imap.c:707
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "正在產生 IMAP4 連線到 %s:%d …\n"
 
-#: libsylph/imap.c:758
+#: libsylph/imap.c:760
 msgid "Can't start TLS session.\n"
 msgstr "無法開啟 TLS 連線\n"
 
-#: libsylph/imap.c:905
+#: libsylph/imap.c:907
 msgid "(retrieving FLAGS...)"
 msgstr "(取回旗標…)"
 
-#: libsylph/imap.c:1296
+#: libsylph/imap.c:1298
 #, c-format
 msgid "Getting message %u"
 msgstr "取得郵件 %u"
 
-#: libsylph/imap.c:1418
+#: libsylph/imap.c:1420
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "附加郵件至 %s (%d / %d)"
 
-#: libsylph/imap.c:1544
+#: libsylph/imap.c:1546
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "正在移動郵件 %s 到 %s …"
 
-#: libsylph/imap.c:1549
+#: libsylph/imap.c:1551
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "正在複製郵件 %s 到 %s …"
 
-#: libsylph/imap.c:1691
+#: libsylph/imap.c:1693
 #, c-format
 msgid "Removing messages %s"
 msgstr "正在移除郵件 %s"
 
-#: libsylph/imap.c:1697
+#: libsylph/imap.c:1699
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "無法設定刪除的旗標：%s\n"
 
-#: libsylph/imap.c:1705 libsylph/imap.c:1811
+#: libsylph/imap.c:1707 libsylph/imap.c:1813
 msgid "can't expunge\n"
 msgstr "無法刪除\n"
 
-#: libsylph/imap.c:1795
+#: libsylph/imap.c:1797
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "正在移除 %s 中的所有郵件"
 
-#: libsylph/imap.c:1800 libsylph/imap.c:1805
+#: libsylph/imap.c:1802 libsylph/imap.c:1807
 msgid "can't set deleted flags: 1:*\n"
 msgstr "無法設定刪除的旗標：1:*\n"
 
-#: libsylph/imap.c:1856
+#: libsylph/imap.c:1858
 msgid "can't close folder\n"
 msgstr "無法選擇資料夾\n"
 
-#: libsylph/imap.c:1935
+#: libsylph/imap.c:1937
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "根資料夾 %s 不存在。\n"
 
-#: libsylph/imap.c:2135 libsylph/imap.c:2143
+#: libsylph/imap.c:2137 libsylph/imap.c:2145
 msgid "error occurred while getting LIST.\n"
 msgstr "取得 LIST 時發生錯誤。\n"
 
-#: libsylph/imap.c:2375
+#: libsylph/imap.c:2377
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "無法產生 %s\n"
 
-#: libsylph/imap.c:2380
+#: libsylph/imap.c:2382
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "無法在收件匣下產生 %s\n"
 
-#: libsylph/imap.c:2442
+#: libsylph/imap.c:2444
 msgid "can't create mailbox: LIST failed\n"
 msgstr "無法產生信箱：LIST 失敗\n"
 
-#: libsylph/imap.c:2465
+#: libsylph/imap.c:2470
 msgid "can't create mailbox\n"
 msgstr "無法產生信箱\n"
 
-#: libsylph/imap.c:2594
+#: libsylph/imap.c:2478
+#, fuzzy
+msgid "can't subscribe mailbox\n"
+msgstr "無法產生信箱\n"
+
+#: libsylph/imap.c:2603
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "信箱 %s 無法更名為 %s\n"
 
-#: libsylph/imap.c:2683
+#: libsylph/imap.c:2692
 msgid "can't delete mailbox\n"
 msgstr "無法刪除信箱\n"
 
-#: libsylph/imap.c:2713
+#: libsylph/imap.c:2722
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "擷取郵件表頭 (%d / %d)"
 
-#: libsylph/imap.c:2765
+#: libsylph/imap.c:2774
 msgid "error occurred while getting envelope.\n"
 msgstr "取得信封時發生錯誤。\n"
 
-#: libsylph/imap.c:2786
+#: libsylph/imap.c:2795
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "無法解析信封：%s\n"
 
-#: libsylph/imap.c:2843
+#: libsylph/imap.c:2852
 msgid "can't get envelope\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:2963 libsylph/imap.c:2969
+#: libsylph/imap.c:2972 libsylph/imap.c:2978
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器：%s:%d\n"
 
-#: libsylph/imap.c:2986
+#: libsylph/imap.c:2995
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "無法產生 IMAP4 連線：%s:%d\n"
 
-#: libsylph/imap.c:3061
+#: libsylph/imap.c:3070
 msgid "can't get namespace\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:3685
+#: libsylph/imap.c:3694
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾：%s\n"
 
-#: libsylph/imap.c:3723
+#: libsylph/imap.c:3732
 msgid "error on imap command: STATUS\n"
 msgstr "發生錯誤的 imap 命令： STATUS\n"
 
-#: libsylph/imap.c:3847 libsylph/imap.c:3882
+#: libsylph/imap.c:3856 libsylph/imap.c:3891
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 認證失敗\n"
 
-#: libsylph/imap.c:3935
+#: libsylph/imap.c:3944
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登入失敗。\n"
 
-#: libsylph/imap.c:4344 libsylph/imap.c:4351
+#: libsylph/imap.c:4364 libsylph/imap.c:4371
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "無法將郵件從 %s 搬移到 %s。\n"
 
-#: libsylph/imap.c:4358
+#: libsylph/imap.c:4378
 msgid "(sending file...)"
 msgstr "（送出檔案 …）"
 
-#: libsylph/imap.c:4387
+#: libsylph/imap.c:4407
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "無法附加郵件到 %s\n"
 
-#: libsylph/imap.c:4419
+#: libsylph/imap.c:4439
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "無法將郵件 %s 移到 %s\n"
 
-#: libsylph/imap.c:4442
+#: libsylph/imap.c:4462
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 發生錯誤，命令為： STORE %s %s\n"
 
-#: libsylph/imap.c:4458
+#: libsylph/imap.c:4478
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 發生錯誤，命令為： EXPUNGE\n"
 
-#: libsylph/imap.c:4473
+#: libsylph/imap.c:4493
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 發生錯誤，命令為： CLOSE\n"
 
-#: libsylph/imap.c:4794
+#: libsylph/imap.c:4814
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "無法將 UTF-7 轉換為 %s\n"
 
-#: libsylph/imap.c:4826
+#: libsylph/imap.c:4846
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "無法轉換 %s 為 UTF-7\n"
@@ -501,7 +506,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "使用 POP3 通訊協定時發生錯誤\n"
 
 #: libsylph/prefs.c:209 libsylph/prefs.c:237 libsylph/prefs.c:282
-#: libsylph/prefs_account.c:234 libsylph/prefs_account.c:248
+#: libsylph/prefs_account.c:253 libsylph/prefs_account.c:267
 #: src/prefs_display_header.c:415 src/prefs_display_header.c:440
 msgid "failed to write configuration to file\n"
 msgstr "寫入組態設定時失敗。\n"
@@ -553,50 +558,50 @@ msgstr "SMTP 回覆錯誤\n"
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP 認證時發生錯誤\n"
 
-#: libsylph/ssl.c:131
+#: libsylph/ssl.c:132
 msgid "SSLv23 not available\n"
 msgstr "不支援 SSLv23\n"
 
-#: libsylph/ssl.c:133
+#: libsylph/ssl.c:134
 msgid "SSLv23 available\n"
 msgstr "支援 SSLv23\n"
 
-#: libsylph/ssl.c:143
+#: libsylph/ssl.c:144
 msgid "TLSv1 not available\n"
 msgstr "不支援 TLSv1\n"
 
-#: libsylph/ssl.c:145
+#: libsylph/ssl.c:146
 msgid "TLSv1 available\n"
 msgstr "支援 TLSv1\n"
 
-#: libsylph/ssl.c:237 libsylph/ssl.c:244
+#: libsylph/ssl.c:238 libsylph/ssl.c:245
 msgid "SSL method not available\n"
 msgstr "不支援 SSL\n"
 
-#: libsylph/ssl.c:250
+#: libsylph/ssl.c:251
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "未知的 SSL 操作錯誤\n"
 
-#: libsylph/ssl.c:256
+#: libsylph/ssl.c:257
 msgid "Error creating ssl context\n"
 msgstr "SSL 傳輸發生錯誤\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:275
+#: libsylph/ssl.c:276
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "使用 %s 進行 SSL 連線\n"
 
-#: libsylph/ssl.c:293
+#: libsylph/ssl.c:294
 msgid "Server certificate:\n"
 msgstr "伺服器認證：\n"
 
-#: libsylph/ssl.c:296
+#: libsylph/ssl.c:297
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  主旨: %s\n"
 
-#: libsylph/ssl.c:301
+#: libsylph/ssl.c:302
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  發信人: %s\n"
@@ -653,7 +658,7 @@ msgstr ""
 "您應該已經隨軟體收到一份 GPL；若沒有，請寫信到自由軟體基金會，地址是：\n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:137 src/mainwindow.c:4035
+#: src/account_dialog.c:137 src/mainwindow.c:4058
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -690,14 +695,14 @@ msgstr ""
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
 #: src/account_dialog.c:376 src/addressadd.c:181 src/addressbook.c:776
-#: src/compose.c:5451 src/editaddress.c:777 src/editaddress.c:826
-#: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
+#: src/compose.c:5517 src/editaddress.c:777 src/editaddress.c:826
+#: src/editbook.c:198 src/editgroup.c:490 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:274 src/prefs_folder_item.c:171 src/select-keys.c:313
 msgid "Name"
 msgstr "名稱"
 
-#: src/account_dialog.c:381 src/prefs_account_dialog.c:739
+#: src/account_dialog.c:381 src/prefs_account_dialog.c:765
 msgid "Protocol"
 msgstr "通訊協定"
 
@@ -825,13 +830,13 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將地址加入通訊錄"
 
-#: src/addressadd.c:191 src/compose.c:3358 src/prefs_toolbar.c:89
+#: src/addressadd.c:191 src/compose.c:3419 src/prefs_toolbar.c:89
 #: src/select-keys.c:314
 msgid "Address"
 msgstr "地址"
 
 #: src/addressadd.c:201 src/addressbook.c:832 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
+#: src/editaddress.c:695 src/editgroup.c:492 src/importcsv.c:126
 msgid "Remarks"
 msgstr "備註"
 
@@ -843,7 +848,7 @@ msgstr "選擇通訊錄資料夾"
 msgid "Auto-registered address"
 msgstr "自動登錄的位址"
 
-#: src/addressbook.c:405 src/compose.c:578 src/mainwindow.c:551
+#: src/addressbook.c:405 src/compose.c:583 src/mainwindow.c:558
 #: src/messageview.c:166
 msgid "/_File"
 msgstr "/檔案(_F)"
@@ -864,10 +869,10 @@ msgstr "/檔案(_F)/新增 _J-Pilot"
 msgid "/_File/New _LDAP Server"
 msgstr "/檔案(_F)/新增 _LDAP 伺服器"
 
-#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:583
-#: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:569
-#: src/mainwindow.c:572 src/mainwindow.c:574 src/mainwindow.c:576
-#: src/mainwindow.c:581 src/mainwindow.c:583 src/messageview.c:168
+#: src/addressbook.c:414 src/addressbook.c:417 src/compose.c:588
+#: src/compose.c:593 src/compose.c:596 src/compose.c:599 src/mainwindow.c:576
+#: src/mainwindow.c:579 src/mainwindow.c:581 src/mainwindow.c:583
+#: src/mainwindow.c:588 src/mainwindow.c:590 src/messageview.c:168
 #: src/messageview.c:173
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
@@ -884,21 +889,21 @@ msgstr "/檔案(_F)/刪除(_D)"
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:419 src/compose.c:595 src/messageview.c:174
+#: src/addressbook.c:419 src/compose.c:600 src/messageview.c:174
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
 #: src/addressbook.c:421 src/addressbook.c:468 src/addressbook.c:485
-#: src/compose.c:597 src/mainwindow.c:587 src/messageview.c:176
+#: src/compose.c:602 src/mainwindow.c:594 src/messageview.c:176
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:422 src/compose.c:602 src/mainwindow.c:588
+#: src/addressbook.c:422 src/compose.c:607 src/mainwindow.c:595
 #: src/messageview.c:177
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
-#: src/addressbook.c:423 src/compose.c:603
+#: src/addressbook.c:423 src/compose.c:608
 msgid "/_Edit/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
@@ -942,7 +947,7 @@ msgstr "/地址(_A)/編輯(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:440 src/compose.c:713 src/mainwindow.c:835
+#: src/addressbook.c:440 src/compose.c:718 src/mainwindow.c:842
 #: src/messageview.c:299
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -955,12 +960,12 @@ msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/匯入 _CSV 檔案"
 
-#: src/addressbook.c:444 src/compose.c:737 src/mainwindow.c:893
+#: src/addressbook.c:444 src/compose.c:742 src/mainwindow.c:904
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/求助(_H)"
 
-#: src/addressbook.c:445 src/compose.c:738 src/mainwindow.c:913
+#: src/addressbook.c:445 src/compose.c:743 src/mainwindow.c:924
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/求助(_H)/關於(_A)"
@@ -978,7 +983,7 @@ msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
 #: src/addressbook.c:467 src/addressbook.c:477 src/addressbook.c:484
-#: src/addressbook.c:487 src/compose.c:569 src/compose.c:572
+#: src/addressbook.c:487 src/compose.c:574 src/compose.c:577
 #: src/folderview.c:258 src/folderview.c:261 src/folderview.c:266
 #: src/folderview.c:269 src/folderview.c:282 src/folderview.c:285
 #: src/folderview.c:287 src/folderview.c:292 src/folderview.c:295
@@ -1020,7 +1025,7 @@ msgstr "通訊錄"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:687 src/addressbook.c:4258 src/folderview.c:398
-#: src/prefs_account_dialog.c:2000 src/query_search.c:401
+#: src/prefs_account_dialog.c:2070 src/query_search.c:401
 msgid "Folder"
 msgstr "資料夾"
 
@@ -1032,17 +1037,17 @@ msgstr "E-Mail 地址"
 msgid "Search:"
 msgstr "搜尋："
 
-#: src/addressbook.c:913 src/compose.c:3303 src/headerview.c:57
+#: src/addressbook.c:913 src/compose.c:3364 src/headerview.c:57
 #: src/prefs_folder_item.c:340 src/prefs_template.c:200
 msgid "To:"
 msgstr "收件者："
 
-#: src/addressbook.c:917 src/compose.c:3320 src/headerview.c:58
+#: src/addressbook.c:917 src/compose.c:3381 src/headerview.c:58
 #: src/prefs_folder_item.c:357 src/prefs_template.c:202
 msgid "Cc:"
 msgstr "副本："
 
-#: src/addressbook.c:921 src/compose.c:3337 src/prefs_folder_item.c:368
+#: src/addressbook.c:921 src/compose.c:3398 src/prefs_folder_item.c:368
 #: src/prefs_template.c:204
 msgid "Bcc:"
 msgstr "密件副本："
@@ -1245,7 +1250,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:6959 src/main.c:940
+#: src/alertpanel.c:142 src/compose.c:7054 src/main.c:940
 msgid "Notice"
 msgstr "注意"
 
@@ -1301,403 +1306,408 @@ msgstr "棕色"
 msgid "None"
 msgstr "無"
 
-#: src/compose.c:568 src/mimeview.c:135
+#: src/compose.c:573 src/mimeview.c:135
 msgid "/_Open"
 msgstr "/開啟(_O)"
 
-#: src/compose.c:570
+#: src/compose.c:575
 msgid "/_Add..."
 msgstr "/新增(_A)…"
 
-#: src/compose.c:571
+#: src/compose.c:576
 msgid "/_Remove"
 msgstr "/刪除(_R)"
 
-#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/compose.c:578 src/folderview.c:273 src/folderview.c:299
 #: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/內容(_P)…"
 
-#: src/compose.c:579
+#: src/compose.c:584
 msgid "/_File/_Send"
 msgstr "/檔案(_F)/傳送(_S)"
 
-#: src/compose.c:581
+#: src/compose.c:586
 msgid "/_File/Send _later"
 msgstr "/檔案(_F)/稍後傳送(_L)"
 
-#: src/compose.c:584
+#: src/compose.c:589
 msgid "/_File/Save to _draft folder"
 msgstr "/檔案(_F)/儲存至草稿資料夾(_D)"
 
-#: src/compose.c:586
+#: src/compose.c:591
 msgid "/_File/Save and _keep editing"
 msgstr "/檔案(_F)/儲存並繼續編輯(_K)"
 
-#: src/compose.c:589
+#: src/compose.c:594
 msgid "/_File/_Attach file"
 msgstr "/檔案(_F)/附加檔案(_A)"
 
-#: src/compose.c:590
+#: src/compose.c:595
 msgid "/_File/_Insert file"
 msgstr "/檔案(_F)/插入檔案(_I)"
 
-#: src/compose.c:592
+#: src/compose.c:597
 msgid "/_File/Insert si_gnature"
 msgstr "/檔案(_F)/插入簽名(_G)"
 
-#: src/compose.c:593
+#: src/compose.c:598
 msgid "/_File/A_ppend signature"
 msgstr "/檔案(_F)/附加簽名"
 
-#: src/compose.c:598
+#: src/compose.c:603
 msgid "/_Edit/_Undo"
 msgstr "/編輯(_E)/復原(_U)"
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "/_Edit/_Redo"
 msgstr "/編輯(_E)/重複前一個動作(_R)"
 
-#: src/compose.c:600 src/compose.c:607 src/mainwindow.c:591
+#: src/compose.c:605 src/compose.c:612 src/mainwindow.c:598
 #: src/messageview.c:179
 msgid "/_Edit/---"
 msgstr "/編輯(_E)/---"
 
-#: src/compose.c:601
+#: src/compose.c:606
 msgid "/_Edit/Cu_t"
 msgstr "/編輯(_E)/剪下(_T)"
 
-#: src/compose.c:604
+#: src/compose.c:609
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編輯(_E)/貼進引言(_Q)"
 
-#: src/compose.c:606 src/mainwindow.c:589 src/messageview.c:178
+#: src/compose.c:611 src/mainwindow.c:596 src/messageview.c:178
 msgid "/_Edit/Select _all"
 msgstr "/編輯(_E)/全選(_A)"
 
-#: src/compose.c:608
+#: src/compose.c:613
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/編輯(_E)/將目前段落折列(_W)"
 
-#: src/compose.c:610
+#: src/compose.c:615
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/編輯(_E)/將所有過長的列折換(_L)"
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編輯(_E)/自動折列(_O)"
 
-#: src/compose.c:613 src/mainwindow.c:597 src/messageview.c:183
+#: src/compose.c:618 src/mainwindow.c:604 src/messageview.c:183
 #: src/summaryview.c:483
 msgid "/_View"
 msgstr "/檢視(_V)"
 
-#: src/compose.c:614
+#: src/compose.c:619
 msgid "/_View/_To"
 msgstr "/檢視(_V)/收件者(_T)"
 
-#: src/compose.c:615
+#: src/compose.c:620
 msgid "/_View/_Cc"
 msgstr "/檢視(_V)/副本(_C)"
 
-#: src/compose.c:616
+#: src/compose.c:621
 msgid "/_View/_Bcc"
 msgstr "/檢視(_V)/密件副本(_B)"
 
-#: src/compose.c:617
+#: src/compose.c:622
 msgid "/_View/_Reply-To"
 msgstr "/檢視(_V)/回信地址(_R)"
 
-#: src/compose.c:618 src/compose.c:620 src/compose.c:622 src/compose.c:624
-#: src/compose.c:627 src/mainwindow.c:620 src/mainwindow.c:626
-#: src/mainwindow.c:653 src/mainwindow.c:677 src/mainwindow.c:780
-#: src/mainwindow.c:784 src/messageview.c:275
+#: src/compose.c:623 src/compose.c:625 src/compose.c:627 src/compose.c:629
+#: src/compose.c:632 src/mainwindow.c:627 src/mainwindow.c:633
+#: src/mainwindow.c:660 src/mainwindow.c:684 src/mainwindow.c:787
+#: src/mainwindow.c:791 src/messageview.c:275
 msgid "/_View/---"
 msgstr "/檢視(_V)/---"
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "/_View/_Followup-To"
 msgstr "/檢視(_V)/回應到(_F)"
 
-#: src/compose.c:621
+#: src/compose.c:626
 msgid "/_View/R_uler"
 msgstr "/檢視(_V)/尺規(_U)"
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "/_View/_Attachment"
 msgstr "/檢視(_V)/附加(_A)"
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/檢視(_V)/自訂工具列(_S)…"
 
-#: src/compose.c:633 src/mainwindow.c:684 src/messageview.c:190
+#: src/compose.c:638 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding"
 msgstr "/檢視(_V)/字元編碼(_E)"
 
-#: src/compose.c:634
+#: src/compose.c:639
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/檢視(_V)/字元編碼(_E)/自動(_A)"
 
-#: src/compose.c:636 src/compose.c:642 src/compose.c:648 src/compose.c:652
-#: src/compose.c:660 src/compose.c:664 src/compose.c:670 src/compose.c:676
-#: src/compose.c:680 src/compose.c:690 src/compose.c:694 src/compose.c:702
-#: src/compose.c:706 src/mainwindow.c:680 src/mainwindow.c:687
+#: src/compose.c:641 src/compose.c:647 src/compose.c:653 src/compose.c:657
+#: src/compose.c:665 src/compose.c:669 src/compose.c:675 src/compose.c:681
+#: src/compose.c:685 src/compose.c:695 src/compose.c:699 src/compose.c:707
+#: src/compose.c:711 src/mainwindow.c:687 src/mainwindow.c:694
 #: src/messageview.c:186
 msgid "/_View/Character _encoding/---"
 msgstr "/檢視(_V)/字元編碼(_E)/---"
 
-#: src/compose.c:638 src/mainwindow.c:688 src/messageview.c:194
+#: src/compose.c:643 src/mainwindow.c:695 src/messageview.c:194
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/檢視(_V)/字元編碼(_E)/7位元 ASCII (US-ASC_II)"
 
-#: src/compose.c:640 src/mainwindow.c:690 src/messageview.c:197
+#: src/compose.c:645 src/mainwindow.c:697 src/messageview.c:197
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/檢視(_V)/字元編碼(_E)/萬國碼 (_UTF-8)"
 
-#: src/compose.c:644 src/mainwindow.c:694 src/messageview.c:200
+#: src/compose.c:649 src/mainwindow.c:701 src/messageview.c:200
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/檢視(_V)/字元編碼(_E)/西歐語系 (ISO-8859-_1)"
 
-#: src/compose.c:646 src/mainwindow.c:696 src/messageview.c:202
+#: src/compose.c:651 src/mainwindow.c:703 src/messageview.c:202
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/檢視(_V)/字元編碼(_E)/西歐語系 (ISO-8859-15)"
 
-#: src/compose.c:650 src/mainwindow.c:702 src/messageview.c:207
+#: src/compose.c:655 src/mainwindow.c:709 src/messageview.c:207
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/檢視(_V)/字元編碼(_E)/中歐語系 (ISO-8859-_2)"
 
-#: src/compose.c:654 src/mainwindow.c:706 src/messageview.c:210
+#: src/compose.c:659 src/mainwindow.c:713 src/messageview.c:210
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/檢視(_V)/字元編碼(_E)/波羅的海語 (ISO-8859-13)(_B)"
 
-#: src/compose.c:656 src/mainwindow.c:708 src/messageview.c:212
+#: src/compose.c:661 src/mainwindow.c:715 src/messageview.c:212
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/檢視(_V)/字元編碼(_E)/波羅的海語 (ISO-8859-_4)"
 
-#: src/compose.c:658 src/mainwindow.c:710 src/messageview.c:214
+#: src/compose.c:663 src/mainwindow.c:717 src/messageview.c:214
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/檢視(_V)/字元編碼(_E)/波羅的海語 (Windows-1257)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:217
+#: src/compose.c:667 src/mainwindow.c:721 src/messageview.c:217
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/檢視(_V)/字元編碼(_E)/希臘語 (ISO-8859-_7)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:220
+#: src/compose.c:671 src/mainwindow.c:725 src/messageview.c:220
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/檢視(_V)/字元編碼(_E)/阿拉伯語 (ISO-8859-_6)"
 
-#: src/compose.c:668 src/mainwindow.c:720 src/messageview.c:222
+#: src/compose.c:673 src/mainwindow.c:727 src/messageview.c:222
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/檢視(_V)/字元編碼(_E)/阿拉伯語 (Windows-1256)"
 
-#: src/compose.c:672 src/mainwindow.c:724 src/messageview.c:225
+#: src/compose.c:677 src/mainwindow.c:731 src/messageview.c:225
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/檢視(_V)/字元編碼(_E)/希臘語 (ISO-8859-_8)"
 
-#: src/compose.c:674 src/mainwindow.c:726 src/messageview.c:227
+#: src/compose.c:679 src/mainwindow.c:733 src/messageview.c:227
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/檢視(_V)/字元編碼(_E)/斯拉夫語 (Windows-1255)"
 
-#: src/compose.c:678 src/mainwindow.c:730 src/messageview.c:230
+#: src/compose.c:683 src/mainwindow.c:737 src/messageview.c:230
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/檢視(_V)/字元編碼(_E)/土耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:682 src/mainwindow.c:734 src/messageview.c:233
+#: src/compose.c:687 src/mainwindow.c:741 src/messageview.c:233
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/檢視(_V)/字元編碼(_E)/斯拉夫語 (ISO-8859-_5)"
 
-#: src/compose.c:684 src/mainwindow.c:736 src/messageview.c:235
+#: src/compose.c:689 src/mainwindow.c:743 src/messageview.c:235
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/檢視(_V)/字元編碼(_E)/斯拉夫語 (KOI8-_R)"
 
-#: src/compose.c:686 src/mainwindow.c:738 src/messageview.c:237
+#: src/compose.c:691 src/mainwindow.c:745 src/messageview.c:237
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/檢視(_V)/字元編碼(_E)/斯拉夫語 (KOI8-U)"
 
-#: src/compose.c:688 src/mainwindow.c:740 src/messageview.c:239
+#: src/compose.c:693 src/mainwindow.c:747 src/messageview.c:239
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/檢視(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:692 src/mainwindow.c:744 src/messageview.c:242
+#: src/compose.c:697 src/mainwindow.c:751 src/messageview.c:242
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/檢視(_V)/字元編碼(_E)/日語 (ISO-2022-_JP)"
 
-#: src/compose.c:696 src/mainwindow.c:754 src/messageview.c:251
+#: src/compose.c:701 src/mainwindow.c:761 src/messageview.c:251
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/檢視(_V)/字元編碼(_E)/簡化字漢語 (_GB2312)"
 
-#: src/compose.c:698 src/mainwindow.c:756 src/messageview.c:253
+#: src/compose.c:703 src/mainwindow.c:763 src/messageview.c:253
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/檢視(_V)/字元編碼(_E)/簡化字漢語 (_GBK)"
 
-#: src/compose.c:700 src/mainwindow.c:758 src/messageview.c:255
+#: src/compose.c:705 src/mainwindow.c:765 src/messageview.c:255
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/檢視(_V)/字元編碼(_E)/傳統字漢語 (_Big5)"
 
-#: src/compose.c:704 src/mainwindow.c:766 src/messageview.c:262
+#: src/compose.c:709 src/mainwindow.c:773 src/messageview.c:262
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/檢視(_V)/字元編碼(_E)/韓語 (EUC-_KR)"
 
-#: src/compose.c:708 src/mainwindow.c:772 src/messageview.c:267
+#: src/compose.c:713 src/mainwindow.c:779 src/messageview.c:267
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/檢視(_V)/字元編碼(_E)/泰語 (TIS-620)"
 
-#: src/compose.c:710 src/mainwindow.c:774 src/messageview.c:269
+#: src/compose.c:715 src/mainwindow.c:781 src/messageview.c:269
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/檢視(_V)/字元編碼(_E)/泰語 (Windows-874)"
 
-#: src/compose.c:714 src/mainwindow.c:836 src/messageview.c:300
+#: src/compose.c:719 src/mainwindow.c:843 src/messageview.c:300
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/通訊錄(_A)"
 
-#: src/compose.c:715
+#: src/compose.c:720
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用郵件模板(_T)"
 
-#: src/compose.c:717 src/mainwindow.c:860 src/messageview.c:316
+#: src/compose.c:722 src/mainwindow.c:867 src/messageview.c:316
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/執行外部指令(_N)"
 
-#: src/compose.c:719 src/compose.c:722 src/compose.c:726 src/compose.c:732
-#: src/mainwindow.c:839 src/mainwindow.c:853 src/mainwindow.c:858
-#: src/mainwindow.c:861 src/mainwindow.c:867 src/mainwindow.c:869
-#: src/messageview.c:303 src/messageview.c:315
+#: src/compose.c:724 src/compose.c:727 src/compose.c:731 src/compose.c:737
+#: src/mainwindow.c:846 src/mainwindow.c:860 src/mainwindow.c:865
+#: src/mainwindow.c:868 src/mainwindow.c:874 src/mainwindow.c:876
+#: src/mainwindow.c:880 src/messageview.c:303 src/messageview.c:315
 msgid "/_Tools/---"
 msgstr "/工具(_T)"
 
-#: src/compose.c:720
+#: src/compose.c:725
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/使用其他的編輯器(_X)"
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "/_Tools/Request _disposition notification"
 msgstr "/工具(_T)/要求部署通知"
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 簽名(_G)"
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:733
+#: src/compose.c:738
 msgid "/_Tools/_Check spell"
 msgstr "/工具(_T)/拼寫檢查(_C)"
 
-#: src/compose.c:734
+#: src/compose.c:739
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/設定拼寫語言(_S)"
 
-#: src/compose.c:1017
+#: src/compose.c:1022
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: 檔案不存在\n"
 
-#: src/compose.c:1119 src/compose.c:1199
+#: src/compose.c:1124 src/compose.c:1204
 msgid "Can't get text part\n"
 msgstr "沒有文字部份\n"
 
-#: src/compose.c:1749
+#: src/compose.c:1754
 msgid "Quote mark format error."
 msgstr "引言格式錯誤。"
 
-#: src/compose.c:1760
+#: src/compose.c:1765
 msgid "Message reply/forward format error."
 msgstr "回覆/轉寄郵件格式錯誤。"
 
-#: src/compose.c:2273
+#: src/compose.c:2288
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:2277
+#: src/compose.c:2292
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小\n"
 
-#: src/compose.c:2282 src/compose.c:4507
+#: src/compose.c:2297 src/compose.c:4568
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
 
-#: src/compose.c:2287
+#: src/compose.c:2302
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s。"
 
-#: src/compose.c:2320
+#: src/compose.c:2335
 #, c-format
 msgid "Message: %s"
 msgstr "郵件：%s"
 
-#: src/compose.c:2382 src/mimeview.c:579
+#: src/compose.c:2397 src/mimeview.c:579
 msgid "Can't get the part of multipart message."
 msgstr "無法取得郵件的附加部份。"
 
-#: src/compose.c:2872 src/headerview.c:259 src/query_search.c:794
+#: src/compose.c:2887 src/headerview.c:259 src/query_search.c:794
 #: src/rpop3.c:704 src/summaryview.c:2521
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
-#: src/compose.c:2875
+#: src/compose.c:2890
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 編寫郵件%s"
 
-#: src/compose.c:2998
+#: src/compose.c:2993 src/compose.c:6129 src/prefs_account_dialog.c:1352
+#, fuzzy, c-format
+msgid "Signature %d"
+msgstr "簽名"
+
+#: src/compose.c:3059
 msgid "Recipient is not specified."
 msgstr "沒有指定收件者。"
 
-#: src/compose.c:3006
+#: src/compose.c:3067
 msgid "Empty subject"
 msgstr "主旨空白"
 
-#: src/compose.c:3007
+#: src/compose.c:3068
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有主旨。確定要送出？"
 
-#: src/compose.c:3071
+#: src/compose.c:3132
 msgid "Attachment is missing"
 msgstr "缺少附件"
 
-#: src/compose.c:3072
+#: src/compose.c:3133
 msgid "There is no attachment. Send it without attachments?"
 msgstr "沒有任何附件。不需附件就發送它？"
 
-#: src/compose.c:3189 src/compose.c:3215
+#: src/compose.c:3250 src/compose.c:3276
 msgid "Check recipients"
 msgstr "檢查收件者"
 
-#: src/compose.c:3235
+#: src/compose.c:3296
 msgid "Really send this mail to the following addresses?"
 msgstr "真的要發送這封郵件到下列位址？"
 
-#: src/compose.c:3248 src/compose.c:5315 src/headerview.c:56
+#: src/compose.c:3309 src/compose.c:5377 src/headerview.c:56
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:3270 src/headerview.c:60 src/prefs_template.c:208
+#: src/compose.c:3331 src/headerview.c:60 src/prefs_template.c:208
 msgid "Subject:"
 msgstr "主旨："
 
-#: src/compose.c:3363
+#: src/compose.c:3424
 msgid "_Send"
 msgstr "發送(_S)"
 
-#: src/compose.c:3393
+#: src/compose.c:3454
 #, fuzzy
 msgid ""
 "Checking for new messages is currently running.\n"
 "Please try again later."
 msgstr "檢查每個資料夾中的新郵件…"
 
-#: src/compose.c:3529
+#: src/compose.c:3590
 msgid "can't get recipient list."
 msgstr "無法取得收件者或收件新聞群組名單。"
 
-#: src/compose.c:3557
+#: src/compose.c:3618
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1705,39 +1715,39 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:3577 src/send_message.c:353
+#: src/compose.c:3638 src/send_message.c:353
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:3627
+#: src/compose.c:3688
 msgid ""
 "Sending of message was completed, but the message could not be saved to "
 "outbox."
 msgstr "已完成郵件發送，但是郵件無法存入寄件匣。"
 
-#: src/compose.c:3682
+#: src/compose.c:3743
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到任何與目前選取之金鑰「%s」相關的金鑰。"
 
-#: src/compose.c:3725 src/compose.c:4119
+#: src/compose.c:3786 src/compose.c:4180
 msgid "Can't sign the message."
 msgstr "無法為郵件簽名。"
 
-#: src/compose.c:3755 src/compose.c:4170
+#: src/compose.c:3816 src/compose.c:4231
 msgid "Can't encrypt the message."
 msgstr "無法加密郵件。"
 
-#: src/compose.c:3794 src/compose.c:4164
+#: src/compose.c:3855 src/compose.c:4225
 msgid "Can't encrypt or sign the message."
 msgstr "無法加密或為郵件簽名。"
 
-#: src/compose.c:3842 src/compose.c:4201 src/compose.c:4264 src/compose.c:4384
+#: src/compose.c:3903 src/compose.c:4262 src/compose.c:4325 src/compose.c:4445
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態\n"
 
-#: src/compose.c:3875
+#: src/compose.c:3936
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1747,11 +1757,11 @@ msgstr ""
 "無法將郵件內文的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要以 %s 傳送嗎？"
 
-#: src/compose.c:3881
+#: src/compose.c:3942
 msgid "Code conversion error"
 msgstr "轉換編碼時發生錯誤"
 
-#: src/compose.c:3967
+#: src/compose.c:4028
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1764,15 +1774,15 @@ msgstr ""
 "\n"
 "無論如何都要傳送嗎？"
 
-#: src/compose.c:3971
+#: src/compose.c:4032
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:4138
+#: src/compose.c:4199
 msgid "Encrypting with Bcc"
 msgstr "加密密件副本"
 
-#: src/compose.c:4139
+#: src/compose.c:4200
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1785,94 +1795,104 @@ msgstr ""
 "\n"
 "無論如何都要發送它？"
 
-#: src/compose.c:4344
+#: src/compose.c:4405
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:4362
+#: src/compose.c:4423
 msgid "queueing message...\n"
 msgstr "送進佇列匣中…\n"
 
-#: src/compose.c:4450
+#: src/compose.c:4511
 msgid "can't find queue folder\n"
 msgstr "找不到佇列匣\n"
 
-#: src/compose.c:4457
+#: src/compose.c:4518
 msgid "can't queue the message\n"
 msgstr "無法放進佇列匣\n"
 
-#: src/compose.c:4502
+#: src/compose.c:4563
 #, c-format
 msgid "File %s doesn't exist."
 msgstr "檔案 %s 不存在。"
 
-#: src/compose.c:4511
+#: src/compose.c:4572
 #, c-format
 msgid "Can't open file %s."
 msgstr "無法開啟檔案 %s。"
 
-#: src/compose.c:5262
+#: src/compose.c:5324
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗…\n"
 
-#: src/compose.c:5391
+#: src/compose.c:5457
 msgid "PGP Sign"
 msgstr "PGP 簽名"
 
-#: src/compose.c:5394
+#: src/compose.c:5460
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:5432 src/mimeview.c:209
+#: src/compose.c:5498 src/mimeview.c:209
 msgid "Data type"
 msgstr "資料類型"
 
 #. S_COL_DATE
-#: src/compose.c:5441 src/mimeview.c:217 src/prefs_filter_edit.c:511
+#: src/compose.c:5507 src/mimeview.c:217 src/prefs_filter_edit.c:511
 #: src/prefs_summary_column.c:72 src/rpop3.c:440 src/select-keys.c:311
 #: src/summaryview.c:5525
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6621
+#: src/compose.c:6121
+#, fuzzy
+msgid "Signature:"
+msgstr "簽名"
+
+#: src/compose.c:6136
+#, fuzzy
+msgid "Change signature"
+msgstr "檢查數位簽名中"
+
+#: src/compose.c:6716
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:6639
+#: src/compose.c:6734
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:6708
+#: src/compose.c:6803
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:6726
+#: src/compose.c:6821
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. Encoding
-#: src/compose.c:6728 src/prefs_common_dialog.c:1203
+#: src/compose.c:6823 src/prefs_common_dialog.c:1203
 #: src/prefs_common_dialog.c:1870
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:6751 src/prefs_folder_item.c:202
+#: src/compose.c:6846 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:6752
+#: src/compose.c:6847
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:6841
+#: src/compose.c:6936
 msgid "File not exist."
 msgstr "檔案不存在。"
 
-#: src/compose.c:6851 src/mimeview.c:1259 src/mimeview.c:1274
+#: src/compose.c:6946 src/mimeview.c:1259 src/mimeview.c:1274
 msgid "Opening executable file"
 msgstr "正在開啟可執行的檔案"
 
-#: src/compose.c:6852 src/mimeview.c:1260 src/mimeview.c:1275
+#: src/compose.c:6947 src/mimeview.c:1260 src/mimeview.c:1275
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -1883,12 +1903,12 @@ msgstr ""
 "如果您要執行它，請將它存於其他地方並且確定它並非是病毒或者某種心懷不軌的程"
 "式。"
 
-#: src/compose.c:6894
+#: src/compose.c:6989
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:6956
+#: src/compose.c:7051
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1897,48 +1917,48 @@ msgstr ""
 "外部編輯器仍然在工作中。\n"
 "要強迫結束該行程嗎(行程代碼：%d)？\n"
 
-#: src/compose.c:7296 src/mainwindow.c:3069
+#: src/compose.c:7391 src/mainwindow.c:3080
 msgid "_Customize toolbar..."
 msgstr "自訂工具列(_C)…"
 
-#: src/compose.c:7464 src/compose.c:7470 src/compose.c:7492
+#: src/compose.c:7567 src/compose.c:7573 src/compose.c:7595
 msgid "Can't queue the message."
 msgstr "無法放進佇列匣。"
 
-#: src/compose.c:7605
+#: src/compose.c:7708
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:7628 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
+#: src/compose.c:7731 src/inputdialog.c:372 src/prefs_common_dialog.c:4750
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:7682
+#: src/compose.c:7785
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:7683
+#: src/compose.c:7786
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:7685 src/compose.c:7689
+#: src/compose.c:7788 src/compose.c:7792
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:7736
+#: src/compose.c:7839
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件模板嗎？"
 
-#: src/compose.c:7738
+#: src/compose.c:7841
 msgid "Apply template"
 msgstr "套用郵件模板"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:7739
+#: src/compose.c:7842
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -1979,7 +1999,7 @@ msgid "Nick Name"
 msgstr "暱稱"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:125
+#: src/editgroup.c:491 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-Mail 地址"
 
@@ -2037,7 +2057,7 @@ msgid " Check File "
 msgstr " 檢查檔案 "
 
 #: src/editbook.c:210 src/editjpilot.c:282 src/editvcard.c:195
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1399
 msgid "File"
 msgstr "檔案"
 
@@ -2045,62 +2065,62 @@ msgstr "檔案"
 msgid "Add New Address Book"
 msgstr "加入新的通訊錄"
 
-#: src/editgroup.c:107
+#: src/editgroup.c:110
 msgid "A Group Name must be supplied."
 msgstr "未指定群組名稱"
 
-#: src/editgroup.c:272
+#: src/editgroup.c:496
 msgid "Edit Group Data"
 msgstr "編輯群組資料"
 
-#: src/editgroup.c:302
+#: src/editgroup.c:526
 msgid "Group Name"
 msgstr "群組名稱"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:543
 msgid "Available Addresses"
 msgstr "可使用之電子郵件地址"
 
-#: src/editgroup.c:347 src/prefs_display_items.c:184
+#: src/editgroup.c:625 src/prefs_display_items.c:184
 #: src/prefs_summary_column.c:253
 msgid "  ->  "
 msgstr "  →  "
 
-#: src/editgroup.c:350 src/prefs_display_items.c:188
+#: src/editgroup.c:628 src/prefs_display_items.c:188
 #: src/prefs_summary_column.c:257
 msgid "  <-  "
 msgstr "  ←  "
 
-#: src/editgroup.c:359
+#: src/editgroup.c:637
 msgid "Addresses in Group"
 msgstr "群組內地址"
 
-#: src/editgroup.c:429
+#: src/editgroup.c:749
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "請使用箭頭指標將電子郵件地址加入或移除該群組"
 
-#: src/editgroup.c:481
+#: src/editgroup.c:811
 msgid "Edit Group Details"
 msgstr "編輯群組詳細資料"
 
-#: src/editgroup.c:484
+#: src/editgroup.c:814
 msgid "Add New Group"
 msgstr "新增群組"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Edit folder"
 msgstr "編輯資料夾"
 
-#: src/editgroup.c:537
+#: src/editgroup.c:871
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:540 src/foldersel.c:602 src/folderview.c:2453
+#: src/editgroup.c:874 src/foldersel.c:602 src/folderview.c:2453
 #: src/folderview.c:2459
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:541 src/foldersel.c:603 src/folderview.c:2460
+#: src/editgroup.c:875 src/foldersel.c:603 src/folderview.c:2460
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -2117,7 +2137,7 @@ msgid "Edit JPilot Entry"
 msgstr "編輯 JPilot 資料"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2028
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:2098
 #: src/prefs_common_dialog.c:2424
 msgid " ... "
 msgstr "…"
@@ -2182,7 +2202,7 @@ msgstr "逾時 (秒)"
 msgid "Maximum Entries"
 msgstr "項目最大值"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:596
+#: src/editldap.c:471 src/prefs_account_dialog.c:622
 msgid "Basic"
 msgstr "基本設定"
 
@@ -2268,7 +2288,7 @@ msgid "MH (number only)"
 msgstr "MH (只有數字)"
 
 #: src/export.c:424 src/export.c:430 src/import.c:663 src/import.c:669
-#: src/prefs_account_dialog.c:1001
+#: src/prefs_account_dialog.c:1027
 msgid " Select... "
 msgstr "選擇…"
 
@@ -2452,12 +2472,12 @@ msgstr "設定資料夾…\n"
 msgid "Setting folder info..."
 msgstr "設定資料夾…"
 
-#: src/folderview.c:928 src/mainwindow.c:4242 src/setup.c:305
+#: src/folderview.c:928 src/mainwindow.c:4265 src/setup.c:305
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s …"
 
-#: src/folderview.c:932 src/mainwindow.c:4247 src/setup.c:310
+#: src/folderview.c:932 src/mainwindow.c:4270 src/setup.c:310
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s …"
@@ -3275,682 +3295,692 @@ msgstr ""
 "找到之前版本的設定檔。\n"
 "您要轉換它嗎？"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:559
 msgid "/_File/_Folder"
 msgstr "/檔案(_F)/資料夾管理(_F)"
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:560
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/新增資料夾(_N)"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:562
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/重新命名資料夾(_R)"
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:563
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/移動資料夾(_M)"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:564
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/檔案(_F)/資料夾管理(_F)/刪除資料夾(_D)"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:565
 msgid "/_File/_Mailbox"
 msgstr "/檔案(_F)/信箱(_M)"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:566
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/檔案(_F)/信箱(_M)/新增信箱(_M)…"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:567
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/檔案(_F)/信箱(_M)/移除信箱(_R)"
 
-#: src/mainwindow.c:561 src/mainwindow.c:566
+#: src/mainwindow.c:568 src/mainwindow.c:573
 msgid "/_File/_Mailbox/---"
 msgstr "/檔案(_F)/信箱(_M)/---"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:569
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/檔案(_F)/信箱(_M)/檢查新郵件(_C)"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:571
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/檔案(_F)/信箱(_M)/檢查所有信箱中的新郵件(_A)"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:574
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/檔案(_F)/信箱(_M)/重建資料夾結構(_E)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:577
 msgid "/_File/_Import mail data..."
 msgstr "/檔案(_F)/匯入郵件資料(_I)…"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:578
 msgid "/_File/_Export mail data..."
 msgstr "/檔案(_F)/匯出郵件資料(_E)…"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:580
 msgid "/_File/Empty all _trash"
 msgstr "/檔案(_F)/清空已刪郵件(_T)"
 
-#: src/mainwindow.c:575 src/messageview.c:167
+#: src/mainwindow.c:582 src/messageview.c:167
 msgid "/_File/_Save as..."
 msgstr "/檔案(_F)/另存新檔(_S)…"
 
-#: src/mainwindow.c:578 src/messageview.c:170
+#: src/mainwindow.c:585 src/messageview.c:170
 msgid "/_File/Page set_up..."
 msgstr "/檔案(_F)/頁面設定(_U)…"
 
-#: src/mainwindow.c:580 src/messageview.c:172
+#: src/mainwindow.c:587 src/messageview.c:172
 msgid "/_File/_Print..."
 msgstr "/檔案(_F)/列印(_P)…"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:589
 msgid "/_File/_Work offline"
 msgstr "/檔案(_F)/離線工作(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:585
+#: src/mainwindow.c:592
 msgid "/_File/E_xit"
 msgstr "/檔案(_F)/離開(_X)"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:597
 msgid "/_Edit/Select _thread"
 msgstr "/編輯(_E)/選取郵件串列(_T)"
 
-#: src/mainwindow.c:592 src/messageview.c:180
+#: src/mainwindow.c:599 src/messageview.c:180
 msgid "/_Edit/_Find in current message..."
 msgstr "/編輯(_E)/在目前郵件中尋找(_F)"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:601
 msgid "/_Edit/_Search messages..."
 msgstr "/編輯(_E)/尋找郵件(_S)"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:602
 msgid "/_Edit/_Quick search"
 msgstr "/編輯(_E)/快速搜尋(_Q)"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:605
 msgid "/_View/Show or hi_de"
 msgstr "/檢視(_V)/顯示或隱藏(_D)"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:606
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/檢視(_V)/顯示或隱藏(_D)/資料夾列表(_F)"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:608
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/檢視(_V)/顯示或隱藏(_D)/郵件預覽(_M)"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:610
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/檢視(_V)/顯示或隱藏(_D)/工具列(_T)"
 
-#: src/mainwindow.c:605
+#: src/mainwindow.c:612
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/檢視(_V)/顯示或隱藏(_D)/工具列(_T)/圖示與文字(_A)"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:614
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/檢視(_V)/顯示或隱藏(_D)/工具列(_T)/文字在圖示右側(_R)"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:616
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/檢視(_V)/顯示或隱藏(_D)/工具列(_T)/圖示(_I)"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:618
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/檢視(_V)/顯示或隱藏(_D)/工具列(_T)/文字(_T)"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:620
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/檢視(_V)/顯示或隱藏(_D)/工具列(_T)/不顯示(_N)"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:622
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/檢視(_V)/顯示或隱藏(_D)/搜尋列(_S)"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:624
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/檢視(_V)/顯示或隱藏(_D)/狀態列(_B)"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:626
 msgid "/_View/_Customize toolbar..."
 msgstr "/檢視(_V)/自訂工具列(_C)…"
 
-#: src/mainwindow.c:621
+#: src/mainwindow.c:628
 msgid "/_View/Layou_t"
 msgstr "/檢視(_V)/版面配置(_T)"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:629
 msgid "/_View/Layou_t/_Normal"
 msgstr "/檢視(_V)/版面配置(_T)/正常(_N)"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:630
 msgid "/_View/Layou_t/_Vertical"
 msgstr "/檢視(_V)/版面配置(_T)/垂直(_V)"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:631
 msgid "/_View/Separate f_older tree"
 msgstr "/檢視(_V)/將資料夾列表分離(_O)"
 
-#: src/mainwindow.c:625
+#: src/mainwindow.c:632
 msgid "/_View/Separate _message view"
 msgstr "/檢視(_V)/將郵件預覽分離(_M)"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:634
 msgid "/_View/_Sort"
 msgstr "/檢視(_V)/排序(_S)"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:635
 msgid "/_View/_Sort/by _number"
 msgstr "/檢視(_V)/排序(_S)/依編號(_N)"
 
-#: src/mainwindow.c:629
+#: src/mainwindow.c:636
 msgid "/_View/_Sort/by s_ize"
 msgstr "/檢視(_V)/排序(_S)/依大小(_I)"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:637
 msgid "/_View/_Sort/by _date"
 msgstr "/檢視(_V)/排序(_S)/依日期(_D)"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:638
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/檢視(_V)/排序(_S)/依串列日期(_H)"
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:639
 msgid "/_View/_Sort/by _from"
 msgstr "/檢視(_V)/排序(_S)/依來源(_F)"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:640
 msgid "/_View/_Sort/by _recipient"
 msgstr "/檢視(_V)/排序(_S)/依收件者(_R)"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:641
 msgid "/_View/_Sort/by _subject"
 msgstr "/檢視(_V)/排序(_S)/依主旨(_S)"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:642
 msgid "/_View/_Sort/by _color label"
 msgstr "/檢視(_V)/排序(_S)/依標記顏色(_C)"
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:644
 msgid "/_View/_Sort/by _mark"
 msgstr "/檢視(_V)/排序(_S)/依標記(_M)"
 
-#: src/mainwindow.c:638
+#: src/mainwindow.c:645
 msgid "/_View/_Sort/by _unread"
 msgstr "/檢視(_V)/排序(_S)/依已讀或未讀(_U)"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:646
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/檢視(_V)/排序(_S)/依附件(_T)"
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:648
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/檢視(_V)/排序(_S)/不排序(_O)"
 
-#: src/mainwindow.c:642 src/mainwindow.c:645
+#: src/mainwindow.c:649 src/mainwindow.c:652
 msgid "/_View/_Sort/---"
 msgstr "/檢視(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:650
 msgid "/_View/_Sort/Ascending"
 msgstr "/檢視(_V)/排序(_S)/遞增"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:651
 msgid "/_View/_Sort/Descending"
 msgstr "/檢視(_V)/排序(_S)/遞減"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:653
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/檢視(_V)/排序(_S)/依郵件串列(_A)"
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:655
 msgid "/_View/Th_read view"
 msgstr "/檢視(_V)/將郵件串列顯示(_R)"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:656
 msgid "/_View/E_xpand all threads"
 msgstr "/檢視(_V)/展開所有郵件串列(_X)"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:657
 msgid "/_View/Co_llapse all threads"
 msgstr "/檢視(_V)/解除所有郵件串列(_L)"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:658
 msgid "/_View/Set display _item..."
 msgstr "/檢視(_V)/設定顯示的項目(_I)…"
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:661
 msgid "/_View/_Go to"
 msgstr "/檢視(_V)/前往(_G)"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:662
 msgid "/_View/_Go to/_Prev message"
 msgstr "/檢視(_V)/前往(_G)/前一封郵件(_P)"
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:663
 msgid "/_View/_Go to/_Next message"
 msgstr "/檢視(_V)/前往(_G)/下一封郵件(_N)"
 
-#: src/mainwindow.c:657 src/mainwindow.c:662 src/mainwindow.c:665
-#: src/mainwindow.c:670 src/mainwindow.c:675
+#: src/mainwindow.c:664 src/mainwindow.c:669 src/mainwindow.c:672
+#: src/mainwindow.c:677 src/mainwindow.c:682
 msgid "/_View/_Go to/---"
 msgstr "/檢視(_V)/前往(_G)/---"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:665
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/檢視(_V)/前往(_G)/前一封未讀郵件(_R)"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:667
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/檢視(_V)/前往(_G)/下一封未讀郵件(_E)"
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:670
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/檢視(_V)/前往(_G)/前一封新郵件(_W)"
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:671
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/檢視(_V)/前往(_G)/下一封新郵件(_X)"
 
-#: src/mainwindow.c:666
+#: src/mainwindow.c:673
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/檢視(_V)/前往(_G)/前一封已標記郵件(_M)"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:675
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/檢視(_V)/前往(_G)/下一封已標記郵件(_A)"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:678
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/檢視(_V)/前往(_G)/前一封已標記顏色之郵件(_L)"
 
-#: src/mainwindow.c:673
+#: src/mainwindow.c:680
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/檢視(_V)/前往(_G)/下一封已標記顏色之郵件(_B)"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:683
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/檢視(_V)/前往(_G)/到其他資料夾(_F)"
 
-#: src/mainwindow.c:685 src/messageview.c:191
+#: src/mainwindow.c:692 src/messageview.c:191
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/檢視(_V)/字元編碼(_E)/自動偵測(_A)"
 
-#: src/mainwindow.c:698 src/messageview.c:204
+#: src/mainwindow.c:705 src/messageview.c:204
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/檢視(_V)/字元編碼(_E)/西歐語系 (Windows-1252)"
 
-#: src/mainwindow.c:746 src/messageview.c:244
+#: src/mainwindow.c:753 src/messageview.c:244
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/檢視(_V)/字元編碼(_E)/日語 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:748 src/messageview.c:246
+#: src/mainwindow.c:755 src/messageview.c:246
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/檢視(_V)/字元編碼(_E)/日語 (_EUC-JP)"
 
-#: src/mainwindow.c:750 src/messageview.c:248
+#: src/mainwindow.c:757 src/messageview.c:248
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/檢視(_V)/字元編碼(_E)/日語 (_Shift__JIS)"
 
-#: src/mainwindow.c:760 src/messageview.c:257
+#: src/mainwindow.c:767 src/messageview.c:257
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/檢視(_V)/字元編碼(_E)/傳統字漢語 (EUC-_TW)"
 
-#: src/mainwindow.c:762 src/messageview.c:259
+#: src/mainwindow.c:769 src/messageview.c:259
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/檢視(_V)/字元編碼(_E)/漢語 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:768 src/messageview.c:264
+#: src/mainwindow.c:775 src/messageview.c:264
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/檢視(_V)/字元編碼(_E)/韓語 (ISO-2022-KR)"
 
-#: src/mainwindow.c:781 src/summaryview.c:484
+#: src/mainwindow.c:788 src/summaryview.c:484
 msgid "/_View/Open in new _window"
 msgstr "/檢視(_V)/在新視窗開啟(_W)"
 
-#: src/mainwindow.c:782 src/messageview.c:276 src/summaryview.c:486
+#: src/mainwindow.c:789 src/messageview.c:276 src/summaryview.c:486
 msgid "/_View/Mess_age source"
 msgstr "/檢視(_V)/觀看郵件原始碼(_A)"
 
-#: src/mainwindow.c:783 src/messageview.c:277 src/summaryview.c:487
+#: src/mainwindow.c:790 src/messageview.c:277 src/summaryview.c:487
 msgid "/_View/All _headers"
 msgstr "/檢視(_V)/所有的標頭(_H)"
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:792
 msgid "/_View/_Update summary"
 msgstr "/檢視(_V)/更新郵件列表(_U)"
 
-#: src/mainwindow.c:787 src/messageview.c:280
+#: src/mainwindow.c:794 src/messageview.c:280
 msgid "/_Message"
 msgstr "/郵件(_M)"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:795
 msgid "/_Message/Recei_ve"
 msgstr "/郵件(_M)/接收(_V)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:796
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/郵件(_M)/接收(_V)/從目前帳號中接收新郵件(_C)"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:798
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/郵件(_M)/接收(_V)/從所有帳號中接收新郵件(_A)"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:800
 msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/郵件(_M)/接收(_V)/停止接收(_G)"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:802
 msgid "/_Message/Recei_ve/_Remote mailbox..."
 msgstr "/郵件(_M)/接收(_V)/遠端信箱(_R)…"
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:804
 msgid "/_Message/Recei_ve/---"
 msgstr "/郵件(_M)/接收(_V)/---"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:805
 msgid "/_Message/_Send queued messages"
 msgstr "/郵件(_M)/將佇列匣中的郵件送出(_S)"
 
-#: src/mainwindow.c:799 src/mainwindow.c:801 src/mainwindow.c:808
-#: src/mainwindow.c:813 src/mainwindow.c:816 src/mainwindow.c:827
-#: src/mainwindow.c:829 src/mainwindow.c:832 src/messageview.c:283
+#: src/mainwindow.c:806 src/mainwindow.c:808 src/mainwindow.c:815
+#: src/mainwindow.c:820 src/mainwindow.c:823 src/mainwindow.c:834
+#: src/mainwindow.c:836 src/mainwindow.c:839 src/messageview.c:283
 #: src/messageview.c:291 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/郵件(_M)/---"
 
-#: src/mainwindow.c:800 src/messageview.c:281
+#: src/mainwindow.c:807 src/messageview.c:281
 msgid "/_Message/Compose _new message"
 msgstr "/郵件(_M)/撰寫郵件(_N)"
 
-#: src/mainwindow.c:802 src/messageview.c:284
+#: src/mainwindow.c:809 src/messageview.c:284
 msgid "/_Message/_Reply"
 msgstr "/郵件(_M)/直接回覆(_R)"
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:810
 msgid "/_Message/Repl_y to"
 msgstr "/郵件(_M)/回覆給(_Y)"
 
-#: src/mainwindow.c:804 src/messageview.c:285
+#: src/mainwindow.c:811 src/messageview.c:285
 msgid "/_Message/Repl_y to/_all"
 msgstr "/郵件(_M)/回覆給(_Y)/所有收件者(_A)"
 
-#: src/mainwindow.c:805 src/messageview.c:287
+#: src/mainwindow.c:812 src/messageview.c:287
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/郵件(_M)/回覆給(_Y)/原作者(_S)"
 
-#: src/mainwindow.c:806 src/messageview.c:289
+#: src/mainwindow.c:813 src/messageview.c:289
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/郵件(_M)/回覆給(_Y)/郵遞論壇(_L)"
 
-#: src/mainwindow.c:809 src/messageview.c:292
+#: src/mainwindow.c:816 src/messageview.c:292
 msgid "/_Message/_Forward"
 msgstr "/郵件(_M)/轉寄(_F)"
 
-#: src/mainwindow.c:810 src/messageview.c:293
+#: src/mainwindow.c:817 src/messageview.c:293
 msgid "/_Message/For_ward as attachment"
 msgstr "/郵件(_M)/將郵件當成附件轉寄(_W)"
 
-#: src/mainwindow.c:812 src/messageview.c:295
+#: src/mainwindow.c:819 src/messageview.c:295
 msgid "/_Message/Redirec_t"
 msgstr "/郵件(_M)/郵件導向(_T)"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:821
 msgid "/_Message/M_ove..."
 msgstr "/郵件(_M)/移動(_O)…"
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:822
 msgid "/_Message/_Copy..."
 msgstr "/郵件(_M)/複製(_C)…"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:824
 msgid "/_Message/_Mark"
 msgstr "/郵件(_M)/標記(_M)"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:825
 msgid "/_Message/_Mark/Set _flag"
 msgstr "/郵件(_M)/標記(_M)/設定標記(_F)"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:826
 msgid "/_Message/_Mark/_Unset flag"
 msgstr "/郵件(_M)/標記(_M)/去除標記(_U)"
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:827
 msgid "/_Message/_Mark/---"
 msgstr "/郵件(_M)/標記(_M)/---"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:828
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/郵件(_M)/標記(_M)/標記為未讀(_E)"
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:829
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/郵件(_M)/標記(_M)/標記為已讀(_D)"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:831
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/郵件(_M)/標記(_M)/標記郵件串列為已讀(_T)"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:833
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/郵件(_M)/標記(_M)/標記所有郵件為已讀(_D)"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:835
 msgid "/_Message/_Delete"
 msgstr "/郵件(_M)/刪除(_D)"
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:837
 msgid "/_Message/Set as _junk mail"
 msgstr "/郵件(_M)/歸類為垃圾郵件(_J)"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:838
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/郵件(_M)/歸類為非垃圾郵件(_U)"
 
-#: src/mainwindow.c:833 src/messageview.c:297
+#: src/mainwindow.c:840 src/messageview.c:297
 msgid "/_Message/Re-_edit"
 msgstr "/郵件(_M)/重新編輯(_E)"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:844
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/工具(_T)/將寄信人加入通訊錄(_K)…"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:847
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/過濾資料夾中所有郵件(_F)"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:849
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/過濾選擇的郵件(_F)"
 
-#: src/mainwindow.c:844 src/messageview.c:304
+#: src/mainwindow.c:851 src/messageview.c:304
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)"
 
-#: src/mainwindow.c:845 src/messageview.c:306
+#: src/mainwindow.c:852 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/自動產生"
 
-#: src/mainwindow.c:847 src/messageview.c:308
+#: src/mainwindow.c:854 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依來源(_F)"
 
-#: src/mainwindow.c:849 src/messageview.c:310
+#: src/mainwindow.c:856 src/messageview.c:310
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依收信人(_T)"
 
-#: src/mainwindow.c:851 src/messageview.c:312
+#: src/mainwindow.c:858 src/messageview.c:312
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依主旨(_S)"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:861
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/工具(_T)/過濾資料夾中所有垃圾郵件(_J)"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:863
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/工具(_T)/過濾選擇的郵件中所有垃圾郵件(_M)"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:870
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/刪除重覆的郵件(_P)"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:872
 msgid "/_Tools/C_oncatenate separated messages"
 msgstr "/工具(_T)/合併分離的郵件(_O)"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:875
 msgid "/_Tools/E_xecute marked process"
 msgstr "/工具(_T)/執行標記的處理(_X)"
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:877
+#, fuzzy
+msgid "/_Tools/Op_en configuration folder"
+msgstr "/工具(_T)/過濾資料夾中所有垃圾郵件(_J)"
+
+#: src/mainwindow.c:879
+#, fuzzy
+msgid "/_Tools/Open a_ttachments folder"
+msgstr "/工具(_T)/過濾資料夾中所有郵件(_F)"
+
+#: src/mainwindow.c:881
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/紀錄視窗(_L)"
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:883
 msgid "/_Configuration"
 msgstr "/設定(_C)"
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:884
 msgid "/_Configuration/_Common preferences..."
 msgstr "/設定(_C)/一般設定(_C)…"
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:886
 msgid "/_Configuration/_Filter settings..."
 msgstr "/設定(_C)/郵件過濾設定(_F)…"
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:888
 msgid "/_Configuration/_Template..."
 msgstr "/設定(_C)/郵件模板設定(_T)…"
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:890
 msgid "/_Configuration/_Actions..."
 msgstr "/設定(_C)/外部指令設定(_A)…"
 
-#: src/mainwindow.c:881
+#: src/mainwindow.c:892
 msgid "/_Configuration/Plug-in _manager..."
 msgstr "/設定(_C)/外掛程式管理(_M)…"
 
-#: src/mainwindow.c:883
+#: src/mainwindow.c:894
 msgid "/_Configuration/---"
 msgstr "/設定(_C)/---"
 
-#: src/mainwindow.c:884
+#: src/mainwindow.c:895
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/設定(_C)/目前帳號設定(_P)…"
 
-#: src/mainwindow.c:886
+#: src/mainwindow.c:897
 msgid "/_Configuration/Create _new account..."
 msgstr "/設定(_C)/新增帳號(_N)…"
 
-#: src/mainwindow.c:888
+#: src/mainwindow.c:899
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/設定(_C)/編輯帳號(_E)…"
 
-#: src/mainwindow.c:890
+#: src/mainwindow.c:901
 msgid "/_Configuration/C_hange current account"
 msgstr "/設定(_C)/改變現有帳號(_H)"
 
-#: src/mainwindow.c:894
+#: src/mainwindow.c:905
 msgid "/_Help/_Manual"
 msgstr "/求助(_H)/說明文件(_M)"
 
-#: src/mainwindow.c:895
+#: src/mainwindow.c:906
 msgid "/_Help/_Manual/_English"
 msgstr "/求助(_H)/說明文件(_M)/英文(_E)"
 
-#: src/mainwindow.c:896
+#: src/mainwindow.c:907
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/求助(_H)/說明文件(_M)/日語(_J)"
 
-#: src/mainwindow.c:897
+#: src/mainwindow.c:908
 msgid "/_Help/_FAQ"
 msgstr "/求助(_H)/常見問題解答(_F)"
 
-#: src/mainwindow.c:898
+#: src/mainwindow.c:909
 msgid "/_Help/_FAQ/_English"
 msgstr "/求助(_H)/常見問題解答(_F)/英語(_E)"
 
-#: src/mainwindow.c:899
+#: src/mainwindow.c:910
 msgid "/_Help/_FAQ/_German"
 msgstr "/求助(_H)/常見問題解答(_F)/德語(_G)"
 
-#: src/mainwindow.c:900
+#: src/mainwindow.c:911
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/求助(_H)/常見問題解答(_F)/西班牙語(_S)"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:912
 msgid "/_Help/_FAQ/_French"
 msgstr "/求助(_H)/常見問題解答(_F)/法語(_F)"
 
-#: src/mainwindow.c:902
+#: src/mainwindow.c:913
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/求助(_H)/常見問題解答(_F)/義大利語(_I)"
 
-#: src/mainwindow.c:903
+#: src/mainwindow.c:914
 msgid "/_Help/_Command line options"
 msgstr "/求助(_H)/命令列選項"
 
-#: src/mainwindow.c:905 src/mainwindow.c:912
+#: src/mainwindow.c:916 src/mainwindow.c:923
 msgid "/_Help/---"
 msgstr "/求助(_H)/---"
 
-#: src/mainwindow.c:906
+#: src/mainwindow.c:917
 msgid "/_Help/_Update check..."
 msgstr "/求助(_H)/檢查更新…"
 
-#: src/mainwindow.c:908
+#: src/mainwindow.c:919
 msgid "/_Help/Update check of _plug-ins..."
 msgstr "/求助(_H)/檢查外掛程式更新…"
 
-#: src/mainwindow.c:955
+#: src/mainwindow.c:966
 msgid "Creating main window...\n"
 msgstr "建立主視窗…\n"
 
-#: src/mainwindow.c:1135
+#: src/mainwindow.c:1146
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1229 src/summaryview.c:2681 src/summaryview.c:2768
+#: src/mainwindow.c:1240 src/summaryview.c:2681 src/summaryview.c:2768
 #: src/summaryview.c:4413 src/summaryview.c:4544 src/summaryview.c:4933
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1349 src/mainwindow.c:1390 src/mainwindow.c:1415
+#: src/mainwindow.c:1360 src/mainwindow.c:1401 src/mainwindow.c:1426
 msgid "Untitled"
 msgstr "無標題"
 
-#: src/mainwindow.c:1416
+#: src/mainwindow.c:1427
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:1785
+#: src/mainwindow.c:1796
 msgid "Offline"
 msgstr "離線"
 
-#: src/mainwindow.c:1786
+#: src/mainwindow.c:1797
 msgid "You are offline. Go online?"
 msgstr "您目前正離線中。要連線嗎？"
 
-#: src/mainwindow.c:1803
+#: src/mainwindow.c:1814
 msgid "Empty all trash"
 msgstr "清空刪除的郵件"
 
-#: src/mainwindow.c:1804
+#: src/mainwindow.c:1815
 msgid "Delete all messages in trash folders?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/mainwindow.c:1835
+#: src/mainwindow.c:1846
 msgid "Add mailbox"
 msgstr "新增信箱"
 
-#: src/mainwindow.c:1836
+#: src/mainwindow.c:1847
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3960,16 +3990,16 @@ msgstr ""
 "並請注意不要輸入已存在的信箱名稱，\n"
 "系統會自動判別是否它已存在。"
 
-#: src/mainwindow.c:1842
+#: src/mainwindow.c:1853
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "信箱「%s」已存在。"
 
-#: src/mainwindow.c:1847 src/setup.c:279
+#: src/mainwindow.c:1858 src/setup.c:279
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1853 src/setup.c:285
+#: src/mainwindow.c:1864 src/setup.c:285
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3978,95 +4008,95 @@ msgstr ""
 "無法產生信箱目錄。\n"
 "可能是因為同樣名稱的檔案已經存在，或者是你沒有權限可以開新目錄。"
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2391
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 資料夾檢視"
 
-#: src/mainwindow.c:2400
+#: src/mainwindow.c:2411
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 郵件列表"
 
-#: src/mainwindow.c:2596 src/mimeview.c:142 src/summaryview.c:438
+#: src/mainwindow.c:2607 src/mimeview.c:142 src/summaryview.c:438
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
-#: src/mainwindow.c:2597
+#: src/mainwindow.c:2608
 msgid "/Reply to _all"
 msgstr "/全部回覆(_A)"
 
-#: src/mainwindow.c:2598
+#: src/mainwindow.c:2609
 msgid "/Reply to _sender"
 msgstr "/回覆給原作者(_S)"
 
-#: src/mainwindow.c:2599
+#: src/mainwindow.c:2610
 msgid "/Reply to mailing _list"
 msgstr "/回覆到郵遞論壇(_L)"
 
-#: src/mainwindow.c:2604 src/summaryview.c:445
+#: src/mainwindow.c:2615 src/summaryview.c:445
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2605 src/summaryview.c:446
+#: src/mainwindow.c:2616 src/summaryview.c:446
 msgid "/For_ward as attachment"
 msgstr "/將郵件當成附件轉寄(_W)"
 
-#: src/mainwindow.c:2606 src/summaryview.c:447
+#: src/mainwindow.c:2617 src/summaryview.c:447
 msgid "/Redirec_t"
 msgstr "/郵件導向(_T)"
 
-#: src/mainwindow.c:3062
+#: src/mainwindow.c:3073
 msgid "Icon _and text"
 msgstr "圖示和文字(_A)"
 
-#: src/mainwindow.c:3063
+#: src/mainwindow.c:3074
 msgid "Text at the _right of icon"
 msgstr "文字在圖示右側(_R)"
 
-#: src/mainwindow.c:3065
+#: src/mainwindow.c:3076
 msgid "_Icon"
 msgstr "圖示(_I)"
 
-#: src/mainwindow.c:3066
+#: src/mainwindow.c:3077
 msgid "_Text"
 msgstr "文字(_T)"
 
-#: src/mainwindow.c:3067
+#: src/mainwindow.c:3078
 msgid "_None"
 msgstr "無(_N)"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3116
 msgid "You are offline. Click the icon to go online."
 msgstr "您目前正離線中。按下按鈕恢復連線。"
 
-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3128
 msgid "You are online. Click the icon to go offline."
 msgstr "您目前正連線中。按下按鈕離線工作。"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:3435
+#: src/mainwindow.c:3446
 msgid "Exit this program?"
 msgstr "您確定要離開嗎？"
 
-#: src/mainwindow.c:3838
+#: src/mainwindow.c:3849
 msgid "The selected messages could not be combined."
 msgstr "已選郵件無法被合併。"
 
-#: src/mainwindow.c:3948
+#: src/mainwindow.c:3971
 msgid "Select folder to open"
 msgstr "選取資料夾以開啟"
 
-#: src/mainwindow.c:4118
+#: src/mainwindow.c:4141
 msgid "Command line options"
 msgstr "命令列選項"
 
-#: src/mainwindow.c:4131
+#: src/mainwindow.c:4154
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法：sylpheed [選項]…"
 
-#: src/mainwindow.c:4139
+#: src/mainwindow.c:4162
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4099,7 +4129,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4158
+#: src/mainwindow.c:4181
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4132,15 +4162,15 @@ msgstr ""
 "顯示這份說明然後離開\n"
 "輸出版本資訊然後離開"
 
-#: src/mainwindow.c:4178
+#: src/mainwindow.c:4201
 msgid "Windows-only option:"
 msgstr "Windows 特有選項："
 
-#: src/mainwindow.c:4186
+#: src/mainwindow.c:4209
 msgid "--ipcport portnum"
 msgstr "--ipcport 通訊埠編號"
 
-#: src/mainwindow.c:4191
+#: src/mainwindow.c:4214
 msgid "specify port for IPC remote commands"
 msgstr "指定用於 IPC 遠端命令的通訊埠"
 
@@ -4375,476 +4405,480 @@ msgstr "檔案："
 msgid "Description: "
 msgstr "描述："
 
-#: src/prefs_account_dialog.c:482
+#: src/prefs_account_dialog.c:487
 msgid "Opening account preferences window...\n"
 msgstr "開啟帳號設定的視窗…\n"
 
-#: src/prefs_account_dialog.c:522
+#: src/prefs_account_dialog.c:527
 #, c-format
 msgid "Account%d"
 msgstr "帳號 %d"
 
-#: src/prefs_account_dialog.c:543
+#: src/prefs_account_dialog.c:551
 msgid "Preferences for new account"
 msgstr "新帳號設定"
 
-#: src/prefs_account_dialog.c:552 src/prefs_toolbar.c:99
+#: src/prefs_account_dialog.c:578 src/prefs_toolbar.c:99
 msgid "Account preferences"
 msgstr "帳號設定"
 
-#: src/prefs_account_dialog.c:578
+#: src/prefs_account_dialog.c:604
 msgid "Creating account preferences window...\n"
 msgstr "產生帳號設定的視窗…\n"
 
-#: src/prefs_account_dialog.c:598 src/prefs_common_dialog.c:832
+#: src/prefs_account_dialog.c:624 src/prefs_common_dialog.c:832
 msgid "Receive"
 msgstr "接收設定"
 
-#: src/prefs_account_dialog.c:600 src/prefs_common_dialog.c:834
+#: src/prefs_account_dialog.c:626 src/prefs_common_dialog.c:834
 #: src/prefs_toolbar.c:50 src/prefs_toolbar.c:102
 msgid "Send"
 msgstr "送出"
 
-#: src/prefs_account_dialog.c:602 src/prefs_common_dialog.c:836
+#: src/prefs_account_dialog.c:628 src/prefs_common_dialog.c:836
 #: src/prefs_folder_item.c:140 src/prefs_toolbar.c:53
 msgid "Compose"
 msgstr "撰寫郵件"
 
-#: src/prefs_account_dialog.c:605 src/prefs_common_dialog.c:843
+#: src/prefs_account_dialog.c:631 src/prefs_common_dialog.c:843
 msgid "Privacy"
 msgstr "私人資料"
 
-#: src/prefs_account_dialog.c:609
+#: src/prefs_account_dialog.c:635
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:638
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: src/prefs_account_dialog.c:614 src/prefs_common_dialog.c:2740
+#: src/prefs_account_dialog.c:640 src/prefs_common_dialog.c:2740
 msgid "Advanced"
 msgstr "進階設定"
 
-#: src/prefs_account_dialog.c:670
+#: src/prefs_account_dialog.c:696
 msgid "Name of this account"
 msgstr "這個帳號的名稱"
 
-#: src/prefs_account_dialog.c:679
+#: src/prefs_account_dialog.c:705
 msgid "Set as default"
 msgstr "設為預設帳號"
 
-#: src/prefs_account_dialog.c:683
+#: src/prefs_account_dialog.c:709
 msgid "Personal information"
 msgstr "個人資訊"
 
-#: src/prefs_account_dialog.c:692
+#: src/prefs_account_dialog.c:718
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account_dialog.c:698
+#: src/prefs_account_dialog.c:724
 msgid "Mail address"
 msgstr "電子郵件地址"
 
-#: src/prefs_account_dialog.c:704
+#: src/prefs_account_dialog.c:730
 msgid "Organization"
 msgstr "服務公司/組織"
 
-#: src/prefs_account_dialog.c:728
+#: src/prefs_account_dialog.c:754
 msgid "Server information"
 msgstr "伺服器資訊"
 
-#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:906
-#: src/prefs_account_dialog.c:1651
+#: src/prefs_account_dialog.c:775 src/prefs_account_dialog.c:932
+#: src/prefs_account_dialog.c:1721
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1014
-#: src/prefs_account_dialog.c:1671 src/prefs_account_dialog.c:1972
+#: src/prefs_account_dialog.c:777 src/prefs_account_dialog.c:1040
+#: src/prefs_account_dialog.c:1741 src/prefs_account_dialog.c:2042
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:753
+#: src/prefs_account_dialog.c:779
 msgid "News (NNTP)"
 msgstr "新聞 (NNTP)"
 
-#: src/prefs_account_dialog.c:755
+#: src/prefs_account_dialog.c:781
 msgid "None (local)"
 msgstr "無 (local)"
 
-#: src/prefs_account_dialog.c:768
+#: src/prefs_account_dialog.c:794
 msgid "This server requires authentication"
 msgstr "這個伺服器需要認證"
 
-#: src/prefs_account_dialog.c:807
+#: src/prefs_account_dialog.c:833
 msgid "News server"
 msgstr "新聞伺服器"
 
-#: src/prefs_account_dialog.c:813
+#: src/prefs_account_dialog.c:839
 msgid "Server for receiving"
 msgstr "接收郵件伺服器"
 
-#: src/prefs_account_dialog.c:819
+#: src/prefs_account_dialog.c:845
 msgid "SMTP server (send)"
 msgstr "SMTP 郵件伺服器 (發信)"
 
-#: src/prefs_account_dialog.c:826 src/prefs_account_dialog.c:1214
+#: src/prefs_account_dialog.c:852 src/prefs_account_dialog.c:1240
 msgid "User ID"
 msgstr "帳號"
 
-#: src/prefs_account_dialog.c:832 src/prefs_account_dialog.c:1223
+#: src/prefs_account_dialog.c:858 src/prefs_account_dialog.c:1249
 msgid "Password"
 msgstr "密碼"
 
-#: src/prefs_account_dialog.c:914
+#: src/prefs_account_dialog.c:940
 msgid "Use secure authentication (APOP)"
 msgstr "使用安全認證（APOP）"
 
-#: src/prefs_account_dialog.c:917
+#: src/prefs_account_dialog.c:943
 msgid "Remove messages on server when received"
 msgstr "接收郵件時一併從伺服器上移除。"
 
-#: src/prefs_account_dialog.c:928
+#: src/prefs_account_dialog.c:954
 msgid "Remove after"
 msgstr "在幾天後移除："
 
-#: src/prefs_account_dialog.c:937
+#: src/prefs_account_dialog.c:963
 msgid "days"
 msgstr "天"
 
-#: src/prefs_account_dialog.c:954
+#: src/prefs_account_dialog.c:980
 msgid "0 days: remove immediately"
 msgstr "0 天：立即移除"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:990
 msgid "Download all messages (including already received) on server"
 msgstr "下載伺服器上所有郵件 (包含已經接收)"
 
-#: src/prefs_account_dialog.c:970
+#: src/prefs_account_dialog.c:996
 msgid "Receive size limit"
 msgstr "接收郵件大小限制"
 
-#: src/prefs_account_dialog.c:977 src/prefs_filter_edit.c:596
+#: src/prefs_account_dialog.c:1003 src/prefs_filter_edit.c:596
 #: src/prefs_filter_edit.c:1057
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:984
+#: src/prefs_account_dialog.c:1010
 msgid "Filter messages on receiving"
 msgstr "接收郵件時進行過濾"
 
-#: src/prefs_account_dialog.c:992
+#: src/prefs_account_dialog.c:1018
 msgid "Default inbox"
 msgstr "預設的收件匣"
 
-#: src/prefs_account_dialog.c:1012
+#: src/prefs_account_dialog.c:1038
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "未經過濾的郵件將會被存到這個資料夾中。"
 
-#: src/prefs_account_dialog.c:1025 src/prefs_account_dialog.c:1184
+#: src/prefs_account_dialog.c:1051 src/prefs_account_dialog.c:1210
 msgid "Authentication method"
 msgstr "認證方法"
 
-#: src/prefs_account_dialog.c:1035 src/prefs_account_dialog.c:1194
+#: src/prefs_account_dialog.c:1061 src/prefs_account_dialog.c:1220
 #: src/prefs_common_dialog.c:1223 src/prefs_common_dialog.c:2864
 #: src/prefs_common_dialog.c:3269
 msgid "Automatic"
 msgstr "自動"
 
-#: src/prefs_account_dialog.c:1043
+#: src/prefs_account_dialog.c:1069
 msgid "Only check INBOX on receiving"
 msgstr "只有在接收時檢查收件匣"
 
-#: src/prefs_account_dialog.c:1045
+#: src/prefs_account_dialog.c:1071
 msgid "Filter new messages in INBOX on receiving"
 msgstr "接收時過濾收件匣中的新郵件"
 
-#: src/prefs_account_dialog.c:1047
+#: src/prefs_account_dialog.c:1073
 msgid "News"
 msgstr "新聞"
 
-#: src/prefs_account_dialog.c:1059
+#: src/prefs_account_dialog.c:1085
 msgid "Maximum number of articles to download"
 msgstr "一次最多下載文章數量"
 
-#: src/prefs_account_dialog.c:1076
+#: src/prefs_account_dialog.c:1102
 msgid "No limit if 0 is specified."
 msgstr "設為 0 則不限制數量。"
 
-#: src/prefs_account_dialog.c:1080
+#: src/prefs_account_dialog.c:1106
 msgid "`Get all' checks for new messages on this account"
 msgstr "「全部檢查」時檢查這個帳號的新郵件"
 
-#: src/prefs_account_dialog.c:1134 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1160 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "郵件標頭設定"
 
-#: src/prefs_account_dialog.c:1141
+#: src/prefs_account_dialog.c:1167
 msgid "Add Date header field"
 msgstr "加入日期"
 
-#: src/prefs_account_dialog.c:1142
+#: src/prefs_account_dialog.c:1168
 msgid "Generate Message-ID"
 msgstr "產生郵件識別碼"
 
-#: src/prefs_account_dialog.c:1149
+#: src/prefs_account_dialog.c:1175
 msgid "Add user-defined header"
 msgstr "加入使用者定義的標頭"
 
-#: src/prefs_account_dialog.c:1151 src/prefs_common_dialog.c:1974
+#: src/prefs_account_dialog.c:1177 src/prefs_common_dialog.c:1974
 #: src/prefs_common_dialog.c:2001
 msgid " Edit... "
 msgstr " 編輯… "
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1187
 msgid "Authentication"
 msgstr "認證"
 
-#: src/prefs_account_dialog.c:1169
+#: src/prefs_account_dialog.c:1195
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 認證 (SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1245
+#: src/prefs_account_dialog.c:1271
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "若是此欄空白，將使用接收時的帳號與密碼。"
 
-#: src/prefs_account_dialog.c:1258
+#: src/prefs_account_dialog.c:1284
 msgid "Authenticate with POP3 before sending"
 msgstr "送信前先做 POP3 認證"
 
 #. signature
-#: src/prefs_account_dialog.c:1297 src/prefs_common_dialog.c:1341
+#: src/prefs_account_dialog.c:1328 src/prefs_common_dialog.c:1341
 #: src/prefs_toolbar.c:117
 msgid "Signature"
 msgstr "簽名"
 
-#: src/prefs_account_dialog.c:1305
+#: src/prefs_account_dialog.c:1336
 msgid "Direct input"
 msgstr "直接輸入"
 
-#: src/prefs_account_dialog.c:1339
+#: src/prefs_account_dialog.c:1359 src/prefs_account_dialog.c:1911
+#: src/prefs_filter_edit.c:256 src/prefs_search_folder.c:187
+msgid "Name:"
+msgstr "姓名："
+
+#: src/prefs_account_dialog.c:1372
+msgid "'Signature 1' will be used by default."
+msgstr ""
+
+#: src/prefs_account_dialog.c:1407
 msgid "Command output"
 msgstr "命令輸出"
 
-#: src/prefs_account_dialog.c:1351
+#: src/prefs_account_dialog.c:1419
 msgid "Put signature before quote (not recommended)"
 msgstr "在引言之前置放簽名 (不建議)"
 
-#: src/prefs_account_dialog.c:1363 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1431 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "在相關欄位上自動加入下列電子郵件信箱："
 
-#: src/prefs_account_dialog.c:1372
+#: src/prefs_account_dialog.c:1440
 msgid "Cc"
 msgstr "複本"
 
-#: src/prefs_account_dialog.c:1385
+#: src/prefs_account_dialog.c:1453
 msgid "Bcc"
 msgstr "密件複本"
 
-#: src/prefs_account_dialog.c:1398
+#: src/prefs_account_dialog.c:1466
 msgid "Reply-To"
 msgstr "回信地址"
 
-#: src/prefs_account_dialog.c:1456
+#: src/prefs_account_dialog.c:1526
 msgid "PGP sign message by default"
 msgstr "預設以 PGP 簽名郵件"
 
-#: src/prefs_account_dialog.c:1458
+#: src/prefs_account_dialog.c:1528
 msgid "PGP encrypt message by default"
 msgstr "預設以 PGP 加密郵件"
 
-#: src/prefs_account_dialog.c:1460
+#: src/prefs_account_dialog.c:1530
 msgid "Encrypt when replying to encrypted message"
 msgstr "回覆加密郵件時也進行加密"
 
-#: src/prefs_account_dialog.c:1462
+#: src/prefs_account_dialog.c:1532
 #, fuzzy
 msgid "Add my own key to the recipients list on encryption"
 msgstr "無法取得收件者或收件新聞群組名單。"
 
-#: src/prefs_account_dialog.c:1464
+#: src/prefs_account_dialog.c:1534
 msgid "Use ASCII-armored format for encryption"
 msgstr "使用 ASCII-armored 格式做加密"
 
-#: src/prefs_account_dialog.c:1466
+#: src/prefs_account_dialog.c:1536
 msgid "Use clear text signature"
 msgstr "使用明碼簽名"
 
-#: src/prefs_account_dialog.c:1471
+#: src/prefs_account_dialog.c:1541
 msgid "Sign / Encryption key"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1549
 msgid "Use default GnuPG key"
 msgstr "使用預設的 GnuPG 金鑰"
 
-#: src/prefs_account_dialog.c:1488
+#: src/prefs_account_dialog.c:1558
 msgid "Select key by your email address"
 msgstr "根據你的電子郵件地址選擇金鑰"
 
-#: src/prefs_account_dialog.c:1497
+#: src/prefs_account_dialog.c:1567
 msgid "Specify key manually"
 msgstr "手動指定金鑰"
 
-#: src/prefs_account_dialog.c:1513
+#: src/prefs_account_dialog.c:1583
 msgid "User or key ID:"
 msgstr "使用者代號或金鑰的識別碼："
 
-#: src/prefs_account_dialog.c:1659 src/prefs_account_dialog.c:1679
-#: src/prefs_account_dialog.c:1698 src/prefs_account_dialog.c:1719
+#: src/prefs_account_dialog.c:1729 src/prefs_account_dialog.c:1749
+#: src/prefs_account_dialog.c:1768 src/prefs_account_dialog.c:1789
 msgid "Don't use SSL"
 msgstr "不使用 SSL"
 
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:1732
 msgid "Use SSL for POP3 connection"
 msgstr "POP3 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1665 src/prefs_account_dialog.c:1685
-#: src/prefs_account_dialog.c:1725
+#: src/prefs_account_dialog.c:1735 src/prefs_account_dialog.c:1755
+#: src/prefs_account_dialog.c:1795
 msgid "Use STARTTLS command to start SSL session"
 msgstr "用 STARTTLS 命令來啟動 SSL"
 
-#: src/prefs_account_dialog.c:1682
+#: src/prefs_account_dialog.c:1752
 msgid "Use SSL for IMAP4 connection"
 msgstr "IMAP4 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1761
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1706
+#: src/prefs_account_dialog.c:1776
 msgid "Use SSL for NNTP connection"
 msgstr "NNTP 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1711
+#: src/prefs_account_dialog.c:1781
 msgid "Send (SMTP)"
 msgstr "送信設定 (SMTP)"
 
-#: src/prefs_account_dialog.c:1722
+#: src/prefs_account_dialog.c:1792
 msgid "Use SSL for SMTP connection"
 msgstr "SMTP 連線時使用 SSL"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1806
 msgid "Use non-blocking SSL"
 msgstr "使用 non-blocking SSL"
 
-#: src/prefs_account_dialog.c:1739
+#: src/prefs_account_dialog.c:1809
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "若您使用 SSL 連線時發生問題，請關閉此選項。"
 
-#: src/prefs_account_dialog.c:1789
+#: src/prefs_account_dialog.c:1859
 msgid "Use SOCKS proxy"
 msgstr "使用 SOCKS 代理伺服器"
 
-#: src/prefs_account_dialog.c:1813
+#: src/prefs_account_dialog.c:1883
 msgid "Hostname:"
 msgstr "主機名稱："
 
-#: src/prefs_account_dialog.c:1822
+#: src/prefs_account_dialog.c:1892
 msgid "Port:"
 msgstr "通訊埠："
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1905
 msgid "Use authentication"
 msgstr "使用認證"
 
-#: src/prefs_account_dialog.c:1841 src/prefs_filter_edit.c:256
-#: src/prefs_search_folder.c:187
-msgid "Name:"
-msgstr "姓名："
-
-#: src/prefs_account_dialog.c:1850
+#: src/prefs_account_dialog.c:1920
 msgid "Password:"
 msgstr "密碼："
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1931
 msgid "Use SOCKS proxy on sending"
 msgstr "發送時使用 SOCKS 代理伺服器"
 
-#: src/prefs_account_dialog.c:1939
+#: src/prefs_account_dialog.c:2009
 msgid "Specify SMTP port"
 msgstr "指定 SMTP 連接埠"
 
-#: src/prefs_account_dialog.c:1945
+#: src/prefs_account_dialog.c:2015
 msgid "Specify POP3 port"
 msgstr "指定 POP3 連接埠"
 
-#: src/prefs_account_dialog.c:1951
+#: src/prefs_account_dialog.c:2021
 msgid "Specify IMAP4 port"
 msgstr "指定 IMAP4 連接埠"
 
-#: src/prefs_account_dialog.c:1957
+#: src/prefs_account_dialog.c:2027
 msgid "Specify NNTP port"
 msgstr "指定 NNTP 連接埠"
 
-#: src/prefs_account_dialog.c:1962
+#: src/prefs_account_dialog.c:2032
 msgid "Specify domain name"
 msgstr "指定網域"
 
-#: src/prefs_account_dialog.c:1983
+#: src/prefs_account_dialog.c:2053
 msgid "IMAP server directory"
 msgstr "IMAP 伺服器目錄"
 
-#: src/prefs_account_dialog.c:1993
+#: src/prefs_account_dialog.c:2063
 msgid "Only the subfolders of this directory will be displayed."
 msgstr "只有顯示這個目錄的子資料夾。"
 
-#: src/prefs_account_dialog.c:1996
+#: src/prefs_account_dialog.c:2066
 msgid "Clear all message caches on exit"
 msgstr "離開時清除所有的郵件快取"
 
-#: src/prefs_account_dialog.c:2041
+#: src/prefs_account_dialog.c:2111
 msgid "Put sent messages in"
 msgstr "將已送出之郵件存到"
 
-#: src/prefs_account_dialog.c:2043
+#: src/prefs_account_dialog.c:2113
 msgid "Put draft messages in"
 msgstr "將郵件草稿存到"
 
-#: src/prefs_account_dialog.c:2045
+#: src/prefs_account_dialog.c:2115
 msgid "Put queued messages in"
 msgstr "置放已佇列郵件於"
 
-#: src/prefs_account_dialog.c:2047
+#: src/prefs_account_dialog.c:2117
 msgid "Put deleted messages in"
 msgstr "將刪除郵件存到"
 
-#: src/prefs_account_dialog.c:2116
+#: src/prefs_account_dialog.c:2188
 msgid "Account name is not entered."
 msgstr "未輸入帳號名稱。"
 
-#: src/prefs_account_dialog.c:2120
+#: src/prefs_account_dialog.c:2192
 msgid "Mail address is not entered."
 msgstr "未輸入電子郵件信箱。"
 
-#: src/prefs_account_dialog.c:2125
+#: src/prefs_account_dialog.c:2197
 msgid "SMTP server is not entered."
 msgstr "未輸入發送郵件伺服器。"
 
-#: src/prefs_account_dialog.c:2130
+#: src/prefs_account_dialog.c:2202
 msgid "User ID is not entered."
 msgstr "未輸入使用者帳號。"
 
-#: src/prefs_account_dialog.c:2135
+#: src/prefs_account_dialog.c:2207
 msgid "POP3 server is not entered."
 msgstr "未輸入接收郵件伺服器。"
 
-#: src/prefs_account_dialog.c:2140
+#: src/prefs_account_dialog.c:2212
 msgid "IMAP4 server is not entered."
 msgstr "未輸入接收郵件伺服器。"
 
-#: src/prefs_account_dialog.c:2145
+#: src/prefs_account_dialog.c:2217
 msgid "NNTP server is not entered."
 msgstr "未輸入新聞伺服器。"
 
-#: src/prefs_account_dialog.c:2171
+#: src/prefs_account_dialog.c:2256
 msgid "Specified folder is not a queue folder."
 msgstr "指定的資料夾並非佇列匣。"
 
-#: src/prefs_account_dialog.c:2281
+#: src/prefs_account_dialog.c:2392
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2017-02-20 04:53:00 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2017-02-20 04:53:00 +0000
commit	84423b4b69f7c0659742730f84a05702b29104bf (patch)
tree	e4378d51ebfa1daca3724c5ee4d17a31294c559b
parent	79263ce504bc39f88164c9ce1d08e2f8b2b45c40 (diff)