made 2.4.0beta7 release.

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

31 files changed, 14189 insertions, 13777 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index a66f45ee..910b91d9 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-03
+
+	* updated cs.po.
+
 2006-04-02
 
 	* updated hu.po.
diff --git a/po/be.po b/po/be.po
index 06120a50..b86a2b3e 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2007-02-27 22:43+0200\n"
 "Last-Translator: Mikalai Udodau <crom dash a at tut dot by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -49,161 +49,161 @@ msgstr "Далучаю паведамленне да %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "Пераношу паведамленні %s у %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Капірую паведамленні %s у %s ..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Выдаляю паведамленні %s"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "нельга ўстанавіць флагі выдалення: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "нельга выкрасліць\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Выдаляю ўсе паведамленні з %s..."
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "нельга ўстанавіць флагі выдалення: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "нельга закрыць каталог\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "каталог кораню %s не існуе\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "памылка здарылася падчас атрымання LIST.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Нельга стварыць `%s'\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Нельга стварыць '%s' у INBOX\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "нельга стварыць скрыню: LIST схібіў\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "нельга стварыць скрыню\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "нельга перайменаваць скрыню: %s у %s\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "нельга выдаліць скрыню\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "нельга атрымаць агібаючую\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Атрымліваю загалоўкі паведамлення (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "памылка здарылася падчас атрымання агібаючай.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "немагчыма разабраць агібаючую: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Немагчыма злучыцца з серверам IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Немагчыма усталяваць сесію IMAP4 з: %s:%d\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "нельга атрымаць прастору імён\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "нельга выбраць каталог: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "памылка пры выкананні загаду imap: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "Аўтэнтыфікацыя IMAP4 схібіла.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "Уваход на сервер IMAP4 схібіў.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "нельга далучыць %s да %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(адпраўка файла...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "нельга далучыць паведамленне да %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "нельга скапіраваць %s у %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "памылка пры выкананні загаду imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "памылка пры выкананні загаду imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "памылка пры выкананні загаду imap: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не можа канвертаваць UTF-7 у %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не можа канвертаваць %s у UTF-7\n"
@@ -295,20 +295,20 @@ msgstr "Экспартую паведамленні з %s у %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "нельга скапіраваць паведамленне %s у %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Нельга адкрыць файл пазнак.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "выточны каталог ідэнтычны з прызначэннем.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Капірую паведамленне %s%c%d у %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -317,7 +317,7 @@ msgstr ""
 "Файл `%s' ужо існуе.\n"
 "Нельга стварыць каталог."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -592,12 +592,12 @@ msgstr " Тэма: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Аўтар: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "нельга змяніць рэжым файла\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "запіс у %s схібіў.\n"
@@ -681,7 +681,7 @@ msgstr ""
 "ў слупку `G' акаунты, якія задзейнічаюць атрыманне лістоў праз `Атр. усе'"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -816,7 +816,7 @@ msgstr "Карыстальніцкі аргумент дзеяння"
 msgid "Add Address to Book"
 msgstr "Дадаць Адрас у Кнігу"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Адрас"
 
@@ -829,7 +829,7 @@ msgstr "Заўвагі"
 msgid "Select Address Book Folder"
 msgstr "Выберыце каталог Адраснай кнігі"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Файл"
@@ -851,9 +851,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/Новы сервер _LDAP"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Файл/---"
@@ -875,11 +875,11 @@ msgid "/_File/_Close"
 msgstr "/_Файл/_Закрыць"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Рэдагаваць"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Рэдагаваць/_Капіраваць"
@@ -916,7 +916,7 @@ msgstr "/_Адрас/Рэдагаваць"
 msgid "/_Address/_Delete"
 msgstr "/_Адрас/Выдаліць"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Прылады"
@@ -925,12 +925,12 @@ msgstr "/_Прылады"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Прылады/Імпартаваць файл _LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Даведка"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Даведка/_Аб праграме"
@@ -975,7 +975,7 @@ msgstr "/_Уставіць"
 msgid "E-Mail address"
 msgstr "Адрас эл.пошты"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Адрасная кніга"
 
@@ -1040,7 +1040,7 @@ msgstr ""
 "Ці сапраўды жадаеце выдаліць каталог І ўсе адрасы ў `%s' ?\n"
 "Пры выдаленні толькі каталога, адрасы будуць перанесены ў каталог-продак."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Выдаліць каталог"
 
@@ -1196,15 +1196,15 @@ msgstr "Супольны адрас"
 msgid "Personal address"
 msgstr "Асабісты адрас"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Нататак"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Папярэджанне"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Памылка"
 
@@ -1304,7 +1304,7 @@ msgstr "/_Рэдагаваць/_Адкаціць"
 msgid "/_Edit/_Redo"
 msgstr "/_Рэдагаваць/Наноў"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Рэдагаваць/---"
@@ -1317,7 +1317,7 @@ msgstr "/_Рэдагаваць/Выразаць"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Рэдагаваць/Ўставіць як цытату"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Рэдагаваць/Вылучыць усё"
 
@@ -1333,7 +1333,7 @@ msgstr "/_Рэдагаваць/Перанесці усе доўгія радкі
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Рэдагаваць/Аўтаперанос"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Выгляд"
@@ -1355,9 +1355,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Выгляд/_Адказаць да"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Выгляд/---"
 
@@ -1377,7 +1377,7 @@ msgstr "/_Выгляд/Укладанне"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Выгляд/Наставіць стужку пр_ылад..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Выгляд/Знаказбор"
 
@@ -1388,112 +1388,112 @@ msgstr "/_Выгляд/Знаказбор/Аўтаматычна"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Выгляд/Знаказбор/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Выгляд/Знаказбор/7-бітны ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Выгляд/Знаказбор/Юнікод (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Выгляд/Знаказбор/Заходнееўрапейскі (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Выгляд/Знаказбор/Заходнееўрапейскі (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Выгляд/Знаказбор/Цэнтральнаеўрапейскі (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Выгляд/Знаказбор/_Балтыйскі (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Выгляд/Знаказбор/Балтыйскі (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Выгляд/Знаказбор/Балтыйскі (Windows-1257)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Выгляд/Знаказбор/Грэчаскі (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Выгляд/Знаказбор/Арабскі (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Выгляд/Знаказбор/Арабскі (Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Выгляд/Знаказбор/Яўрэйскі (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Выгляд/Знаказбор/Яўрэйскі (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Выгляд/Знаказбор/Турэцкі (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Выгляд/Знаказбор/Кірыліца (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Выгляд/Знаказбор/Кірыліца (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Выгляд/Знаказбор/Кірыліца (KOI8-U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Выгляд/Знаказбор/Кірыліца (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Выгляд/Знаказбор/Японскі (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Выгляд/Знаказбор/Спрошчаны Кітайскі (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Выгляд/Знаказбор/Спрошчаны Кітайскі (GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Выгляд/Знаказбор/Традыцыйны Кітайскі (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Выгляд/Знаказбор/Карэйскі (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Выгляд/Знаказбор/Тайскі (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Выгляд/Знаказбор/Тайскі (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Прылады/_Адрасная кніга"
 
@@ -1501,13 +1501,13 @@ msgstr "/_Прылады/_Адрасная кніга"
 msgid "/_Tools/_Template"
 msgstr "/_Прылады/_Шаблон"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Прылады/Дзеянні"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Прылады/---"
@@ -1541,70 +1541,70 @@ msgstr "%s: файл не існуе\n"
 msgid "Can't get text part\n"
 msgstr "Нельга атрымаць частку тэксту\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Памылка фармату пазнакі цытаты."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Памылка фармату адказу/перасылкі паведамлення."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існуе\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Нельга атрымаць памер файлу %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пусты."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Нельга прачытаць %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Паведамленне: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Нельга атрымаць частку састаўнога паведамлення."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Без Тэмы)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Напісанне%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Не указаны атрымальнік."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Пустая тэма"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тэма не азначана. Выслаць як ёсць?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "нельга атрымаць спіс рэспандэнтаў."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1612,22 +1612,22 @@ msgstr ""
 "Не указаны уліковы рахунак для адпраўкі пошты.\n"
 "Калі ласка, выберыце акаунт перад адпраўкай."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Памылка падчас адпраўкі паведамлення да %s."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Нельга захаваць паведамленне ў `дасланых'."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Не знойдзена аніводнага ключа, асацыяванага з выбраным ідэнтыфікатарам `%s'."
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1638,11 +1638,11 @@ msgstr ""
 "\n"
 "Выслаць у %s, як ёсць?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Памылка канверсіі кода"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1655,15 +1655,15 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Ліміт даўжыні радка"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr "Шыфраваць з `Bcc'"
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1677,83 +1677,83 @@ msgstr ""
 "\n"
 "Усё роўна выслаць?"
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "нельга выдаліць старое паведамленне\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "змяшчаю паведамленне ў чаргу...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "не знойдзены каталог чаргі\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "нельга змясціць паведамленне ў чаргу\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "сгенераваны Message-ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Ствараю вакно напісання...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Ад:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "Подпіс PGP"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "Шыфр PGP"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "тып MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Памер"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Няправільны тып MIME."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існуе ці пусты."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Уласцівасці"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кадаванне"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Імя файла"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Няправільны радок загаду для знешняга рэдактара: `%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1762,48 +1762,48 @@ msgstr ""
 "Знешні рэдактар яшчэ працуе.\n"
 "Завершыць працэс гвалтоўна (pid: %d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr "Наставіць _стужку прылад..."
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Нельга змясціць паведамленне ў чаргу."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Выбраць файлы"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Выбраць файл"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Захаваць паведамленне"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Гэта паведамленне было зменена. Захаваць у каталогу чарнавікоў?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "Закрыць без захавання"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Жадаеце ужыць шаблон `%s'?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Ужыць шаблон"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "_Замяніць"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "_Уставіць"
 
@@ -1960,12 +1960,12 @@ msgstr "Рэдагаваць каталог"
 msgid "Input the new name of folder:"
 msgstr "Ўвядзіце новае імя каталогу:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Новы каталог"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Ўвядзіце імя новага каталогу:"
 
@@ -2132,42 +2132,42 @@ msgstr "Выберыце каталог"
 msgid "Select folder"
 msgstr "Выберыце каталог"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Атрыманыя"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Дасланыя"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Чарга"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Смецце"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Чарнавікі"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "НовыКаталог"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не можа быць уключана ў назву каталогу."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Каталог `%s' ужо існуе."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Нельга стварыць каталог '%s'."
@@ -2254,56 +2254,56 @@ msgstr "Устанаўляю інфармацыю аб каталогу...\n"
 msgid "Setting folder info..."
 msgstr "Устанаўляю інфармацыю аб каталогу..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканірую каталог %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканірую каталог %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Перабудаваць дрэва каталога"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дрэва каталогу будзе перабудаванае. Працягваць?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Адбудоўваю дрэва каталогаў..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Перабудаванне дрэва каталогу схібіла."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Спраўджваю новыя паведамленні ва ўсіх каталогах..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Спам"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Выбраны каталог %s\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Загрузка паведамленняў з %s..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Памылка падчас загрузкі паведамлення ў `%s'."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2313,26 +2313,26 @@ msgstr ""
 "(калі жадаеце стварыць каталог з мэтай размяшчэння ў ім\n"
 " падкаталогаў, дадайце `/' на канцы назвы)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Увядзіце новая імя для '%s' :"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Пераіменаваць каталог"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Нельга пераіменаваць каталог '%s'."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Нельга перанесці каталог `%s'."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2341,11 +2341,11 @@ msgstr ""
 "Выдаліць каталог пошуку `%s' ?\n"
 "Самі паведамленні не будуць выдалены."
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Выдаліць каталог пошуку"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2358,20 +2358,20 @@ msgstr ""
 "\n"
 "Сапраўды жадаеце выдаліць?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Нельга выдаліць каталог '%s'."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Ачысціць сметніцу"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Выдаліць усе лісты ў каталогу-сметніцы?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2380,34 +2380,34 @@ msgstr ""
 "Сапраўды выдаліць паштовую скрыню `%s' ?\n"
 "(Паведамленні НЕ будуць выдалены з дыска)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Выдаліць скрыню"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Сапраўды выдаліць IMAP4-акаунт `%s'?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Выдаліць IMAP4-акаунт"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Сапраўды выдаліць групу навін `%s'?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Выдаліць групу навін"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Сапраўды выдаліць акаунт навін `%s'?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Выдаліць акаунт навін"
 
@@ -2553,142 +2553,142 @@ msgstr "Завершыць"
 msgid "Sylpheed: %d new messages"
 msgstr "Сільфід: %d новых паведамленняў"
 
-#: src/inc.c:478
+#: src/inc.c:481
 msgid "Authenticating with POP3"
 msgstr "Аўтэнтыфікацыя POP3"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Атрыманне новых паведамленняў"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Чаканне"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Скасавана"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Атрыманне"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Зроблена (%d паведамленне(і) (%s) атрымана)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Зроблена (няма новых паведамленняў)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Злучэнне не атрымалася"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Аўтарызацыя схібіла"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Замкнута"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завершана (%d новы(х) ліст(оў))"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Завершана (няма новых паведамленняў)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Здарыліся памылкі падчас атрымання пошты."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "атрымліваю новыя паведамленні акаунта %s ...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Аўтэнтыфікацыя POP3"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Атрымліваю новыя паведамленні"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Злучаюся з POP3 серверам: %s..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Нельга злучыцца з серверам POP3: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Аўтэнтыфікацыя..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Атрымліваю паведамленні з %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Атрымліваю колькасць новых паведамленняў (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Атрымліваю колькасць новых паведамленняў (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Атрымліваю колькасць новых паведамленняў (UIDL)"
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Атрымліваю памер паведамленняў (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Выдаляю паведамленне %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Выходжу"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Атрыманне ліста (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Атрыманне (%d ліст(оў) (%s) атрымана)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Злучэнне не атрымалася."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Памылка здарылася падчас апрацоўкі пошты."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2697,28 +2697,28 @@ msgstr ""
 "Здарылася памылка падчас апрацоўкі пошты:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Не засталося месца на дыску."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Нельга запісаць файл."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Памылка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Злучэнне закрытае аддаленым серверам."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Скрыня замкнутая."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2727,11 +2727,11 @@ msgstr ""
 "Паштовая скрыня замкнута:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Аўтэнтыфікацыя схібіла."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2740,15 +2740,15 @@ msgstr ""
 "Аўтэнтыфікацыя схібіла:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Таймаут сесіі."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Атрыманне скасавана\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Атрымліваю новыя паведамленні з %s у %s...\n"
@@ -2879,7 +2879,7 @@ msgstr "Лісты ў чарзе"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "У чарзе засталіся недасланыя паведамленні. Выйсці зараз?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2888,15 +2888,15 @@ msgstr ""
 "Падтрымка OpenPGP адключана."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "другі экземпляр Сільфід ужо запушчаны.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Міграцыя канфігурацыі"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2904,651 +2904,652 @@ msgstr ""
 "Знойдзена папярэдняя версія канфігурацыі.\n"
 "Жадаеце мігрыраваць на яе?"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Файл/_Каталог"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Файл/_Каталог/Стварыць новы каталог..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Файл/_Каталог/_Пераіменаваць каталог..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Файл/_Каталог/_Перанесці каталог..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Файл/_Каталог/_Выдаліць каталог"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Файл/Скрыня"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Файл/Скрыня/Дадаць скрыню..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Файл/Скрыня/Выдаліць скрыню"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_Файл/Скрыня/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Файл/Скрыня/Праверыць новыя лісты"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Файл/Скрыня/Праверыць новыя лісты ва ўсіх скрынях"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Файл/Скрыня/Перабудаваць дрэва каталогаў"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Файл/_Імпартаваць файл mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Файл/_Экспартаваць у mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Файл/Ачысціць сметніцы"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Файл/Захаваць як..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 msgid "/_File/Page set_up..."
 msgstr "/_Файл/Настаўленні аркуша..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Файл/_Друкаваць..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Файл/Працава_ць без злучэння"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Файл/_Выйсці"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Рэдагаваць/Вылучыць нітку"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Рэдагаваць/Знайсці ў бягучым лісце..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Рэдагаваць/Знайсці паведамленні..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Выгляд/Паказаць або схаваць"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Выгляд/Паказаць або схаваць/_Дрэва каталогаў"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Выгляд/Паказаць або схаваць/Прагляд ліста"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Выгляд/Паказаць або схаваць/_Стужка прылад"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Выгляд/Паказаць або схаваць/_Стужка прылад/Іконкі і тэкст"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Выгляд/Паказаць або схаваць/_Стужка прылад/Тэкст справа ад І_конак"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Выгляд/Паказаць або схаваць/_Стужка прылад/_Іконкі"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Выгляд/Паказаць або схаваць/_Стужка прылад/_Тэкст"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Выгляд/Паказаць або схаваць/_Стужка прылад/Нічога"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Выгляд/Паказаць або схаваць/Стужка пошуку"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Выгляд/Паказаць або схаваць/Стужка статуса"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Выгляд/Наставіць стужку прылад..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Выгляд/_Аддзеленае дрэва каталогаў"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/_Выгляд/Аддзелены прагляд лістоў"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Выгляд/_Сартаваць"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Выгляд/_Сартаваць/па нумары"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Выгляд/_Сартаваць/па памеры"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Выгляд/_Сартаваць/па даце"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Выгляд/_Сартаваць/па даце абмеркавання"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Выгляд/_Сартаваць/па палі `Ад'"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Выгляд/_Сартаваць/па адрасату"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Выгляд/_Сартаваць/па тэме"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Выгляд/_Сартаваць/па каляровай метцы"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Выгляд/_Сартаваць/па марцы"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Выгляд/_Сартаваць/па непрачытаным"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Выгляд/_Сартаваць/па ўкладанням"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Выгляд/_Сартаваць/Не сартаваць"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Выгляд/_Сартаваць/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Выгляд/_Сартаваць/Па ўзрастанні"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Выгляд/_Сартаваць/Па ўбыванні"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Выгляд/_Сартаваць/_Сцягваць тэмай"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Выгляд/Прагляд нітак абмеркавання"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Выгляд/_Разгарнуць усе ніткі"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Выгляд/_Згарнуць усе ніткі"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Выгляд/Паказваць элементы..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Выгляд/_Ісці да"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Выгляд/_Ісці да/_Папярэдні ліст"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Выгляд/_Ісці да/Н_аступны ліст"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Выгляд/_Ісці да/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Выгляд/_Ісці да/Папярэдні не_прачытаны ліст"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Выгляд/_Ісці да/Наступны непрачытаны ліст"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Выгляд/_Ісці да/Папярэдні _новы ліст"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Выгляд/_Ісці да/_Наступны новы ліст"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Выгляд/_Ісці да/Папярэдні _маркіраваны ліст"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Выгляд/_Ісці да/Наступны маркіраваны ліст"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Выгляд/_Ісці да/Папярэдні паме_чаны ліст"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Выгляд/_Ісці да/_Наступны памечаны ліст"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Выгляд/Ісці да/Другі каталог..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Выгляд/Знаказбор/_Аўтавызначэнне"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Выгляд/Знаказбор/Заходнееўрапейскі (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Выгляд/Знаказбор/Японскі (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Выгляд/Знаказбор/Японскі (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Выгляд/Знаказбор/Японскі (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Выгляд/Знаказбор/Традыцыйны Кітайскі (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Выгляд/Знаказбор/Кітайскі (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Выгляд/Знаказбор/Карэйскі (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Выгляд/Адкрыць у новым вакне"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Выгляд/Выточны тэкст паведамлення"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/_Выгляд/Усе загалоўкі"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Выгляд/_Аднавіць зводку"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Ліст"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/_Ліст/Атрымаць"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Ліст/Атрымаць/Атрымаць з бягучага акаунта"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Ліст/Атрымаць/Атрымаць з усіх акаунтаў"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Ліст/Атрымаць/Скасаваць атрыманне"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Ліст/Атрымаць/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Ліст/Выслаць лісты з чаргі"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Ліст/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Ліст/Напісаць новы ліст"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Ліст/_Адказаць"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Ліст/Адказ"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Ліст/Адказ/да ўсіх"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Ліст/Адказ/адпраўніку"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Ліст/Адказ/у спіс рассылкі"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Ліст/Пераслаць"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Ліст/Пераслаць як укладанне"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Ліст/Перанакіраваць"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Ліст/_Перанесці..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Ліст/_Капіраваць"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Ліст/_Марка"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Ліст/_Марка/_Маркіраваць"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Ліст/_Марка/_Зняць марку"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Ліст/_Марка/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Ліст/_Марка/Пазначыць як непрачытаны"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Ліст/_Марка/Пазначыць як прачытаны"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Ліст/_Марка/Пазначыць абмеркаванне прачытаным"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Ліст/_Марка/Пазначыць усе прачытанымі"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Ліст/_Выдаліць"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Ліст/_Марка/Пазначыць як _спам"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Ліст/_Марка/Пазначыць як _не-спам"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Ліст/Пера-рэдагаваць"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Прылады/Дадаць адпраўніка ў адрасную кнігу..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Прылады/_Фільтраваць усе лісты ў каталогу"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Прылады/Фільтраваць вылучаныя лісты"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Прылады/_Стварыць правіла фільтра"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Прылады/_Стварыць правіла фільтра/_Аўтаматычна"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Прылады/_Стварыць правіла фільтра/па Адпраўніку"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Прылады/_Стварыць правіла фільтра/па _Каму"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Прылады/_Стварыць правіла фільтра/па _Тэме"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Прылады/_Фільтраваць спам ў каталогу"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Прылады/Фільтраваць спам у вылучаных лістах"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Прылады/Выдаліць падвоеныя паведамленні"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 msgid "/_Tools/E_xecute marked process"
 msgstr "/Прылады/Выканаць пазначанае дзеянне"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Прылады/Вакно журн_ала"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/Наладкі"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Наладкі/Пераважанні..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Наладкі/Наставіць фільтр"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/Наладкі/Шаблон..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/Наладкі/Дзеянні..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/Наладкі/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Наладкі/Перавагі бягучага акаунта..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/Наладкі/Стварыць новы акаунт..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Наладкі/_Рэдагаваць акаунты..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/Наладкі/Змяніць бягучы акаунт"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Даведка/_Кіраўніцтва"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Даведка/_Кіраўніцтва/Англійскае"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Даведка/_Кіраўніцтва/Японскае"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/Даведка/_FAQ"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Даведка/_FAQ/Англійскі"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Даведка/_FAQ/_Нямецкі"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Даведка/_FAQ/Іспанскі"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Даведка/_FAQ/_Французскі"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Даведка/_FAQ/_Італьянскі"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/_Даведка/_Опцыі загаднага радка"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Даведка/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Ствараю галоўнае вакно...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Галоўнае вакно: размяшчэнне колеру %d схібіла\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "зроблена.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Неназваны"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "няма"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Змена тыпу радзельніка вакон з %d на %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Без злучэння"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Вы не злучаны. Злучыцца?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Ачысціць сметніцы"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Выдаліць усе паведамленні ў каталогах-сметніцах?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Дадаць скрыню"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3558,16 +3559,16 @@ msgstr ""
 "Калі указана існуючая скрыня, яна будзе\n"
 "прасканіравана аўтаматычна."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скрыня `%s' ужо існуе."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Скрыня"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3576,67 +3577,67 @@ msgstr ""
 "Стварэнне паштовай скрыні схібіла.\n"
 "Магчыма, файлы ўжо існуюць, ці вы не маеце дазволу на запіс у тым месцы."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Сільфід - Прагляд Каталогаў"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Сільфід - Прагляд Паведамлення"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Адказаць"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Адказаць усім"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Адказаць адпраўніку"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Адказаць у ліст рассылкі"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Пераправіць"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Пераслаць як укладанне"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Перанакіраваць"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr "Вы не злучаны. Клікніце іконку, каб злучыцца."
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы ў злучэнні. Клікніце іконку, каб адлучыцца."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Выхад"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Выйсці з праграмы?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Опцыі загаднага радка"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Ужыванне: sylpheed [ОПЦЫЯ]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3664,7 +3665,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3897,7 +3898,7 @@ msgstr "Акаунт%d"
 msgid "Preferences for new account"
 msgstr "Пераважанні новага акаунта"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Пераважанні акаунта"
 
@@ -3910,7 +3911,7 @@ msgid "Receive"
 msgstr "Атрыманне"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Адпраўка"
 
@@ -4122,7 +4123,7 @@ msgstr "Аўтэнтыфікацыя POP3 перад адпраўкай"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Подпіс"
 
@@ -4580,7 +4581,7 @@ msgstr "Захоўваць папярэднія адрасы пры адказе
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Рэдактар"
 
@@ -5675,7 +5676,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Выдаляць [...] або (...) у пачатку тэмы пры адказе"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Акаунт"
 
@@ -5881,79 +5882,89 @@ msgstr "Друк"
 msgid "Print message"
 msgstr "Друкаваць паведамленне"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Крок"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Сервер для атрымання"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Выканаць"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Выканаць пазначаны працэс"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Пераважанні"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Агульныя пераважанні "
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Адправіць паведамленне"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Выслаць пазней"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Змясціць у каталог чаргі і выслаць пазней"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Чарнавік"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Захаваць у каталогу чарнавікоў"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Уставіць"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Уставіць файл"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Укласці"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Укласці файл"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Дадаць подпіс"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Рэдагаваць знешнім рэдактарам"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Варот радкоў"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Пераносіць усе доўгія радкі"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 msgid "Customize toolbar"
 msgstr "Наставіць стужку прылад"
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
 "the order by using the Up / Down button."
@@ -6204,7 +6215,7 @@ msgstr "Не знойдзены подпіс"
 msgid "Good signature from \"%s\""
 msgstr "Правільны подпіс ад \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Правільны подпіс"
 
@@ -6213,7 +6224,7 @@ msgstr "Правільны подпіс"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Подпіс правільны, але ключ для \"%s\" застаецца не давераны"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Правільны подпіс (недавераны ключ)"
 
@@ -6249,7 +6260,7 @@ msgstr "Подпіс правільны, але ключ подпісу быў �
 msgid "BAD signature from \"%s\""
 msgstr "НЕСАПРАЎДНЫ подпіс ад \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "ДРЭННЫ подпіс"
 
@@ -6718,11 +6729,15 @@ msgstr "файл %s ужо існуе\n"
 msgid "Creating text view...\n"
 msgstr "Стварэнне выгляду тэксту...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Гэта паведамленне не можа быць паказана.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -6730,31 +6745,31 @@ msgstr ""
 "Тэкст цела паведамлення не можа быць паказаны, бо запіс у часовы файл не "
 "атрымаўся.\n"
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "Захаваць рысунак як..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Напісаць новае паведамленне"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Дадаць да адраснай кніг_і..."
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "Капіраваць _адрас"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "Адкрыць Веб-браўзерам"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Капіраваць _спасылку"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6767,7 +6782,7 @@ msgstr ""
 "\n"
 "Адкрыць усе роўна?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Папарэджанне - несапраўдны URL"
 
diff --git a/po/bg.po b/po/bg.po
index 5aa0c096..384c592e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+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"
@@ -54,162 +54,162 @@ msgstr "Изпращане на съобщение (%d / %d байта)"
 msgid "Moving messages %s to %s ..."
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Получаване на съобщения от %s..."
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не могат да се установят изтрити флагове: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "не може да се заличи\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Получаване на съобщения от %s..."
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не могат да се установят изтрити флагове: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "не може да затвори папка\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "коренната папка %s не съществува\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "грешка при получаване на LIST.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Не може да се създаде '%s'\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Не може да се създаде '%s' под Входящи\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Не може да се създаде пощенска кутия: LIST се провали\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "Не може да се създаде пощенска кутия\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Не може да се преименува пощенска кутия: %s до %s\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "Не може да се изтрие пощенска кутия\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "не може да се вземе envelope\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "грешка при вземане на envelope.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "не може да се анализира envelope: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не може да се установи връзка с IMAP4 сървър: %s:%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не може да се установи IMAP4 сесия с:  %s:%d\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "не може да се получи пространството от имена\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не може да се избере папка: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "грешка при imap команда: CLOSE\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 удостоверяване провалено.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 влизане провалено.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не може да се прибави %s към %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(изпращане на файл...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "съобщението не може да се прибави към %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не може да се копира %s в %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "грешка при imap команда: STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "грешка при imap команда: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "грешка при imap команда: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може да преобразува UTF-7 до %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може да преобразува %s до UTF-7\n"
@@ -299,20 +299,20 @@ msgstr "Изнасяне на съобщения от %s във %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "не може да се копира съобщението %s във %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Не може да се отвори файлът с маркировките.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "изходната папка е еднаква с назначението.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -321,7 +321,7 @@ msgstr ""
 "Файлът `%s' вече съществува.\n"
 "Папката не може да се създаде."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -592,12 +592,12 @@ msgstr "  Субект: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Издател: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "не може да се смени вида на файла\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "записът в %s се провали.\n"
@@ -679,7 +679,7 @@ msgstr ""
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -816,7 +816,7 @@ msgstr "Потребителски аргумент на действието"
 msgid "Add Address to Book"
 msgstr "Добавяне на Адреса към Книгата"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
 
@@ -829,7 +829,7 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Файл"
@@ -852,9 +852,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/Нов _Сървър"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Файл/---"
@@ -876,11 +876,11 @@ msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
@@ -917,7 +917,7 @@ msgstr "/_Адрес/_Редактиране"
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Инструменти"
@@ -926,12 +926,12 @@ msgstr "/_Инструменти"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
@@ -978,7 +978,7 @@ msgstr "/_Редактиране/_Вмъкване"
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -1044,7 +1044,7 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
@@ -1203,15 +1203,15 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Забележка"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Грешка"
 
@@ -1316,7 +1316,7 @@ msgstr "/_Редактиране/_Отмяна"
 msgid "/_Edit/_Redo"
 msgstr "/_Редактиране/_Повтаряне"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Редактиране/---"
@@ -1329,7 +1329,7 @@ msgstr "/_Редактиране/_Отрязване"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Редактиране/Вмъкване като _цитат"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Редактиране/_Избиране на всички"
 
@@ -1346,7 +1346,7 @@ msgstr "/_Редактиране/П_ренасяне на всички дълг�
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Изглед"
@@ -1368,9 +1368,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Изглед/_Отговор до"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Изглед/---"
 
@@ -1391,7 +1391,7 @@ msgstr "/_Изглед/_Притурка"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
@@ -1403,138 +1403,138 @@ msgstr ""
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Изглед/_Кодиране/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Изглед/_Кодиране/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Изглед/_Кодиране/Central European (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Изглед/_Кодиране/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Изглед/_Кодиране/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Изглед/_Кодиране/Greek (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Изглед/_Кодиране/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Изглед/_Кодиране/Cyrillic (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Изглед/_Кодиране/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Изглед/_Кодиране/Korean (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Изглед/_Кодиране/Thai (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Изглед/_Кодиране/Thai (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Инструменти/_Адресна книга"
 
@@ -1542,13 +1542,13 @@ msgstr "/_Инструменти/_Адресна книга"
 msgid "/_Tools/_Template"
 msgstr "/_Инструменти/_Шаблон"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Инструменти/---"
@@ -1587,71 +1587,71 @@ msgstr "%s: файлът не съществува\n"
 msgid "Can't get text part\n"
 msgstr "Не може да се намери текстовата част\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Грешка в формата на цитат."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Грешка в reply/forward формата на съобщението."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файлът %s не съществува\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не може да се намери големината на %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Файлът %s е празен."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Не може да се прочете %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Съобщение: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Съставяне на съобщение%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Не е указан получател"
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 #, fuzzy
 msgid "Empty subject"
 msgstr "Тема"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Празна тема. Изпращане така?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "не може да се получи списък с получатели."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1659,21 +1659,21 @@ msgstr ""
 "Не е указан акаунт за изпращане на пощата.\n"
 "Моля изберете пощенску акаунт преди изпращане."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Не може да се запази съобщението в изходящата кутия."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не можа да се намери бутон асоцииран с избрания `%s'."
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1684,12 +1684,12 @@ msgstr ""
 "%s към %s.\n"
 "Изпращане така?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1698,15 +1698,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1715,85 +1715,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "не може да се изтрие старото съобщение\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "нареждане на съобщението на опашката...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "не може да се намери папката за опашка\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "не може да се нареди съобщението на опашката\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерирано Message-ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Създаване на прозорец за съставяне...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Инструменти/_Действия"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "MIME тип"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1803,52 +1803,52 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -2006,12 +2006,12 @@ msgstr "Редактиране на папка"
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папка:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Въведете име на нова папка:"
 
@@ -2179,42 +2179,42 @@ msgstr "Директория на спула"
 msgid "Select folder"
 msgstr "Избор на папка"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Входящи"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Изпратени"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Опашка"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Кошче"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Чернови"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може да бъде включено в име на папка"
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папката `%s' вече съществува"
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Папката `%s' не може да бъде създадена."
@@ -2306,56 +2306,56 @@ msgstr "Установяване информация за папка...\n"
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Възобновяване дървото на папката"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дървото на папката ще бъде възобновено. Продължане?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Възобновяване дървото на папката..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Възобновяване на дървото на папката провалено."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Проверяване за нови съобщения във всички папки..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s е избрана\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2365,26 +2365,26 @@ msgstr ""
 "(ако желаете да създадете папка за съхраняване на подпапки,\n"
 " добавете `/' на края на името)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Въведете ново име за `%s'"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Преименуване на папка"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2393,12 +2393,12 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Изтриване на папка"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2409,21 +2409,21 @@ msgstr ""
 "Всички папки и съобщения под `%s' ше бъдат изтрити.\n"
 "Наистина ли желаете изтриване?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2432,34 +2432,34 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Желаете ли изтриване на IMAP4 акаунт `%s'?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Изтриване на IMAP4 акаунт"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Желаете ли изтриване на новинарска група `%s'?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Изтриване на новинарска група"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Желаете ли изтриване на новинарски акаунт `%s'?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Изтриване на новинарски акаунт"
 
@@ -2605,144 +2605,144 @@ msgstr "Завършване"
 msgid "Sylpheed: %d new messages"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Удостоверяване"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Получаване на нови съобщения"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Изчакване"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Отказан"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Получаване"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Завършено (%d съобщения (%s) получени)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Завършено (няма нови съобщения)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Връзката се провали"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Удостоверяването се провали"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Заключен"
 
-#: src/inc.c:727
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Пауза (сек)"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завършено (%d нови съобщения)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Завършено (няма нови съобщения)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Възникнаха грешки при получаване на пощата."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получаване на нови съобщения от акаунт %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Удостоверяване"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получаване на нови съобщения"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Свързване с POP3 сървър: %s..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не може да се установи връзка с POP3 сървър: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Удостоверяване..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получаване на съобщения от %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Взимане на броят на нови съобщения (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Взимане на броят на нови съобщения (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Взимане на броят на нови съобщения (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Взимане на размерът на съобщенията (LIST)... "
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Изтриване на съобщение %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Прекъсване"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получаване на съобшение (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Получаване (%d съобщения (%s) получени)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Връзката провалена"
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Възникна грешка при обработка на пощата"
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2751,28 +2751,28 @@ msgstr ""
 "Възникна грешка при обработка на пощата:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Няма свободно място на диска"
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Файлът не може да се запише."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Грешка в сокет."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Връзката е прекратена от отдалечения хост."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Пощенската кутия е заключена."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2781,11 +2781,11 @@ msgstr ""
 "Пощенската кутия е заключена:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Удостоверяването се провали."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2794,16 +2794,16 @@ msgstr ""
 "Удостоверяването се провали:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 #, fuzzy
 msgid "Session timed out."
 msgstr "сесията е просрочена\n"
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Обединяването е отменено\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получаване на нови съобшения от %s в %s...\n"
@@ -2930,7 +2930,7 @@ msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Някои неизпратени съобщения са в опашката. Желаете ли изход от програмата?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2939,707 +2939,707 @@ msgstr ""
 "OpenPGP поддръжката е отменена."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "друг Sylpheed е стартиран вече.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Конфигурация на действия"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Файл/_Папка"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Файл/_Папка/Създаване на _нова папка"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Файл/_Папка/П_реименуване на папка..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Файл/_Папка/П_реименуване на папка..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Файл/_Папка/_Изтриване на папка"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Файл/_Добаване на пощенска кутия..."
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Файл/_Добаване на пощенска кутия..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/П_ремахване на пощенска кутия"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Файл/_Папка/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Проверка за нови съобщения"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Файл/_Папка/_Проверка за нови съобщения във всички папки"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Възобновяване дървото на папката"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Файл/_Внасяне на mbox файл..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Файл/_Изнасяне на mbox файл..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Файл/Изпразване на _кошчето"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Файл/З_апазване в..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Файл/З_апазване в..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Файл/Пе_чат..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Файл/_Работа без мрежа"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Файл/Из_ход"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Редактиране/Избор по _тема"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Редактиране/_Търсене в текущото съобщение..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Редактиране/Търсене в _съобщенията..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Изглед/Показване или _скриване"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Изглед/Показване или _скриване/_Дърво на папките"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Изглед/Показване или _скриване/_Изглед на съобщенията"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Изглед/Показване или _скриване/_Лента"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Изглед/Показване или _скриване/_Лента/Икони и _текст"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Икони"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Икони"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Изглед/Показване или _скриване/_Лента/Т_екст"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Изглед/Показване или _скриване/_Лента/_Без показване"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Изглед/Показване или _скриване/Лента на _състоянието"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Изглед/Показване или _скриване/Лента на _състоянието"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Изглед/_Отделно дърво на папките"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Изглед/Отделен изглед на съобщенията"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Изглед/_Сортиране"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Изглед/_Сортиране/по _номер"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Изглед/_Сортиране/по _размер"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Изглед/_Сортиране/по _дата"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Изглед/_Сортиране/по _дата"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Изглед/_Сортиране/по _подател"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Изглед/_Сортиране/по п_олучател"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Изглед/_Сортиране/по _тема"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Изглед/_Сортиране/по _цвят"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Изглед/_Сортиране/по _отбелязване"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Изглед/_Сортиране/по _непрочетени"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Изглед/_Сортиране/по _притурка"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Изглед/_Сортиране/_Без сортиране"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Изглед/_Сортиране/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Изглед/_Сортиране/Възходящо"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Изглед/_Сортиране/_Привличане по тема"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Изглед/_Нишков изглед"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Изглед/_Развиване на всички нишки"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Изглед/_Свиване на всички нишки"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Изглед/Атрибути на извадката"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Изглед/П_реход до"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Изглед/П_реход до/_Предишно съобщение"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Изглед/П_реход до/_Следващо съобщение"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Изглед/П_реход до/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Изглед/П_реход до/П_редишно непрочетено съобщение"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Изглед/П_реход до/С_ледващо непрочетено съобщение"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Изглед/П_реход до/Предишно _ново съобщение"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Изглед/П_реход до/Следващо н_ово съобщение"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Изглед/П_реход до/Предишно _маркирано съобщение"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Изглед/П_реход до/Следващо м_аркирано съобщение"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Изглед/П_реход до/Предишно _оцветено съобщение"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Изглед/П_реход до/Следващо о_цветено съобщение"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Изглед/_Кодиране/_Автоматично разпознаване"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Изглед/_Кодиране/Western European (ISO-8859-15)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Изглед/_Кодиране/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Изглед/_Кодиране/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Изглед/_Кодиране/Japanese (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Изглед/_Кодиране/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Изглед/_Кодиране/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Изглед/_Кодиране/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Изглед/Отваряне в _нов прозорец"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Изглед/_Изходен код"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Изглед/_Цялата заглавна част"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Изглед/_Обновяване на извадката"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Съобщение"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Съобщение/Получаване от _всички акаунти"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:755
 #, fuzzy
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Съобщение/_Отказ на получаване"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Съобщение/_Изпращане на съобщенията в опашката"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Съобщение/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Съобщение/_Съставяне на ново съобщение"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Съобщение/_Отговор"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Съобщение/Отговор _до"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Съобщение/Отговор _до/_всички"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Съобщение/Отговор _до/_подател"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Съобщение/Отговор _до/_пощенски списък"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Съобщение/П_репращане"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Съобщение/Пр_епращане като притурка"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Съобщение/_Пренасочване"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Съобщение/_Преместване"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Съобщение/_Копиране"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Съобщение/_Маркиране"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Съобщение/_Маркиране/_Маркиране"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Съобщение/_Маркиране/_Размаркиране"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Съобщение/_Маркиране/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Съобщение/_Маркиране/като _непрочетено"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Съобщение/_Маркиране/като _прочетено"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Съобщение/_Маркиране/като _прочетено"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Съобщение/_Маркиране/_всички като прочетени"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Съобщение/_Изтриване"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Съобщение/_Получаване на нова поща"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Съобщение/_Редактиране"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Инструменти/_Добавяне на подател в адресната книга"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Инструменти/_Създаване на правило за филтриране"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/_Автоматично"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Подател"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по П_олучател"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Инструменти/_Създаване на правило за филтриране/по _Тема"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Инструменти/_Филтриране на съобщенията"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Инструменти/И_зтриване на повтарящи се съобщения"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Изпълняване на маркирания процес"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Инструменти/_Журнален прозорец"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Конфигуриране"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Конфигуриране/_Общи предпочитания"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Конфигуриране/_Установяване на филтър"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Конфигуриране/_Шаблон"
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Конфигуриране/_Действия"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Конфигуриране/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Конфигуриране/_Предпочитания за текущия акаунт"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Конфигуриране/_Създаване на нов акаунт"
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Конфигуриране/_Редактиране на акаунтите"
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Конфигуриране/С_мяна на текущия акаунт"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Помощ/_Наръчник"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Помощ/_Наръчник/_Английски"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Помощ/_Наръчник/_Японски"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/_Помощ/_Чести въпроси"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Помощ/_Чести въпроси/_Английски"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Помощ/_Чести въпроси/_Немски"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Помощ/_Чести въпроси/_Испански"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Помощ/_Чести въпроси/_Френски"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Помощ/_Чести въпроси/_Италиански"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Не е въведен команден ред."
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Помощ/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Създаване на главен прозорец...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Неозаглавен"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "липсва"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Промяна на разделението на прозореца от %d до %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Без достъп до мрежа"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Работите без достъп до мрежа. Желаете ли да включите мрежата?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Изчистване на кошчето"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Добавяне на пощенска кутия"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3650,16 +3650,16 @@ msgstr ""
 "Ако е указана съществуваща кутия, тя ще бъде\n"
 "сканирана автоматично."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3668,72 +3668,72 @@ msgstr ""
 "Създаването на пощенска кутия се провали.\n"
 "Вече съществуват някакви файлове, или нямате права за запис."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Изглед на папките"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Отговор"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Отговаряне на всички"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr "Работите без достъп до мрежа. Щракнете иконата за да включите мрежата."
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "Работите с достъп до мрежа. Щракнете иконата за да изключите мрежата."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Изход"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Желаете ли изход от програмата?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 #, fuzzy
 msgid "Command line options"
 msgstr "Не е въведен команден ред."
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Употреба: %s [ОПЦИЯ]...\n"
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3749,7 +3749,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3972,7 +3972,7 @@ msgstr "Акаунт%d"
 msgid "Preferences for new account"
 msgstr "Предпочитания за нов акаунт"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Предпочитания за акаунт"
 
@@ -3985,7 +3985,7 @@ msgid "Receive"
 msgstr "Получаване"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Изпращане"
 
@@ -4208,7 +4208,7 @@ msgstr "Удостоверяване с POP3 преди изпращане"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Сигнатура"
 
@@ -4674,7 +4674,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Редактор"
 
@@ -5838,7 +5838,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Изтриване на [...] или (...) в началото на тема при отговор"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Акаунт"
 
@@ -6055,81 +6055,91 @@ msgstr "Печат"
 msgid "Print message"
 msgstr "Изпращане на съобщение"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Стъпка"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Сървър за получаване"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Изпълняване"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Изпълняване на маркирания процес"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Предпочитания"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Общи предпочитания"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Изпращане на съобщение"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Изпращане по-късно"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Поставяне в папката за опашка и изпращане по-късно"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Чернови"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Вмъкване"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Вмъкване на файл"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Прикрепване"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Прикрепване на файл"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 #, fuzzy
 msgid "Append signature"
 msgstr "НЕВАЛИДЕН подпис"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Редакция с външен редактор"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Свиванен на редовете"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Свиване на всички дълги редове"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Изглед/П_реход до/_Друга папка"
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6385,7 +6395,7 @@ msgstr "Не е намерен подпис"
 msgid "Good signature from \"%s\""
 msgstr "Валиден подпис от \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Валиден подпис"
 
@@ -6394,7 +6404,7 @@ msgstr "Валиден подпис"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6431,7 +6441,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "НЕВАЛИДЕН подпис от \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "НЕВАЛИДЕН подпис"
 
@@ -6886,46 +6896,50 @@ msgstr "файл %s вече съществува\n"
 msgid "Creating text view...\n"
 msgstr "Създаване на текстов изглед...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Съобщението не може да бъде показано.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Запазване като..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Добавяне на подателя в адресната книга"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Публичен адрес"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Уеб браузър"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6934,7 +6948,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 600306ce..ca3f0691 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # This file is distributed under the same license as the sylpheed package.
 # Jan Mura <jan_mura@altavista.com>, 2000.
-# .
+# ,
 # Additional translators:
 # Radek Vybíral <Radek.Vybiral@vsb.cz>, 2002, 2003.
 # Petr Kovar <pknbe@volny.cz>, 2007.
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
-"PO-Revision-Date: 2007-02-09 05:34+0100\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
+"PO-Revision-Date: 2007-04-03 01:05+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,10 +26,9 @@ msgstr "Načítá se nastavení všech účtů...\n"
 #: libsylph/imap.c:469
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
-msgstr "Spojení přes IMAP4 s %s bylo rozpojeno. Obnovuje se spojení...\n"
+msgstr "Spojení přes IMAP4 s %s bylo přerušeno. Obnovuje se spojení...\n"
 
 #: libsylph/imap.c:524 libsylph/imap.c:530
-#, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Server IMAP4 vypnul LOGIN.\n"
 
@@ -55,163 +54,163 @@ msgstr "Připojování zprávy k %s (%d / %d)"
 #: libsylph/imap.c:1369
 #, c-format
 msgid "Moving messages %s to %s ..."
-msgstr "Přesouvají se zprávy %s do %s·..."
+msgstr "Přesouvají se zprávy %s do %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
-msgstr "Kopírují se zprávy %s to %s..."
+msgstr "Kopírují se zprávy %s do %s..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Odstraňují se zprávy %s"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
-msgstr "nelze nastavit příznak smazání: %s\n"
+msgstr "nelze opatřit příznakem smazání: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Odstraňují se všechny zprávy v %s"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
-msgstr "nelze nastavit příznak smazané: 1:*\n"
+msgstr "nelze opatřit příznakem smazané: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "nelze zavřít složku\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "kořenová složka %s neexistuje\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "Během příkazu LIST se vyskytla chyba.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nelze vytvořit \"%s\"\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nelze vytvořit \"%s\" v doručené poště\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit poštovní schránku: selhal příkaz LIST\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit poštovní schránku\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, 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:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "nelze smazat poštovní schránku\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "nelze načíst obálku\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
-msgstr "Přijímá se záhlaví zprávy (%d·/·%d)"
+msgstr "Přijímá se záhlaví zprávy (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
-msgstr "Během načítání obálky se vyskytla chyba.\n"
+msgstr "během načítání obálky se vyskytla chyba.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nelze analyzovat obálku: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, 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:2544
+#: libsylph/imap.c:2539
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nelze navázat relaci s IMAP4 serverem: %s:%d\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "nelze vyhledat obálku\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "chyba příkazu služby IMAP: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentizace IMAP4 selhala.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "Neúspěšné přihlášení k IMAP4.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
-msgstr "nelze přpojit %s do %s\n"
+msgstr "nelze přpojit %s k %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(posílání souboru...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
-msgstr "nelze připojit zprávu %s\n"
+msgstr "nelze připojit zprávu k %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
-msgstr "nelze kopírovat %s na %s\n"
+msgstr "nelze kopírovat %s do %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, 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:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba příkazu služby IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba příkazu služby IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemůže konvertovat z UTF-7 na %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemůže konvertovat z %s na UTF-7\n"
@@ -232,7 +231,7 @@ msgstr "nelze přečíst soubor s poštovní schránkou.\n"
 #: libsylph/mbox.c:96
 #, c-format
 msgid "invalid mbox format: %s\n"
-msgstr "Neplatný formát poštovní schránky: %s\n"
+msgstr "neplatný formát poštovní schránky: %s\n"
 
 #: libsylph/mbox.c:103
 #, c-format
@@ -255,7 +254,7 @@ msgstr ""
 #: libsylph/mbox.c:273
 #, c-format
 msgid "%d messages found.\n"
-msgstr "%d zpráv nalezeno.\n"
+msgstr "zpráv nalezeno %d.\n"
 
 #: libsylph/mbox.c:291
 #, c-format
@@ -303,29 +302,29 @@ msgstr "Exportování zprávy z %s do %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "nelze zkopírovat zprávu %s do %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Nelze otevřít označený soubor.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "zdrojová složka je stejná jako cílová.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopírování zprávy %s%c%d do %s...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
 "Can't create folder."
 msgstr ""
-"Soubor \"%s\" už existuje.\n"
+"Soubor \"%s\" již existuje.\n"
 "Nelze vytvořit složku."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -337,17 +336,17 @@ msgid ""
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
 "Název adresáře\n"
-"\"%s\"·není platným řetězcem UTF-8.\n"
+"\"%s\" není platným řetězcem UTF-8.\n"
 "Je možné, že v názvu souboru je použito znakové sady lokalizace libc.\n"
 "V tom případě je nutné nastavit následující proměnou prostředí\n"
-"(podrobnosti viz·README):\n"
+"(podrobnosti viz README):\n"
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 
 #: libsylph/news.c:208
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
-msgstr "Vytvářím spojení přes NNTP s %s:%d ...\n"
+msgstr "vytváří se spojení přes NNTP s %s:%d ...\n"
 
 #: libsylph/news.c:277
 #, c-format
@@ -357,7 +356,7 @@ msgstr "Spojení přes NNTP %s:%d bylo přerušeno. Obnovuje se spojení...\n"
 #: libsylph/news.c:378
 #, c-format
 msgid "article %d has been already cached.\n"
-msgstr "příspěvek %d už byl v mezipaměti.\n"
+msgstr "příspěvek %d již v mezipaměti je.\n"
 
 #: libsylph/news.c:398
 #, c-format
@@ -367,7 +366,7 @@ msgstr "získává se příspěvek %d...\n"
 #: libsylph/news.c:402
 #, c-format
 msgid "can't read article %d\n"
-msgstr "nelze číst příspěvek %d\n"
+msgstr "nelze přečíst příspěvek %d\n"
 
 #: libsylph/news.c:677
 msgid "can't post article.\n"
@@ -386,11 +385,11 @@ msgstr "nelze vybrat skupinu: %s\n"
 #: libsylph/news.c:797
 #, c-format
 msgid "invalid article range: %d - %d\n"
-msgstr "neplatný rozsah příspěvků: %d - %d\n"
+msgstr "neplatný rozsah příspěvků: %d až %d\n"
 
 #: libsylph/news.c:810
 msgid "no new articles.\n"
-msgstr "Žádný nový příspěvek.\n"
+msgstr "žádné nové příspěvky.\n"
 
 #: libsylph/news.c:820
 #, c-format
@@ -403,12 +402,12 @@ msgstr "nelze získat xover\n"
 
 #: libsylph/news.c:834
 msgid "error occurred while getting xover.\n"
-msgstr "Během získávání xover se vyskytla chyba.\n"
+msgstr "během získávání xover se vyskytla chyba.\n"
 
 #: libsylph/news.c:844
 #, c-format
 msgid "invalid xover line: %s\n"
-msgstr "Neplatná řádka xover: %s\n"
+msgstr "neplatná řádka xover: %s\n"
 
 #: libsylph/news.c:863 libsylph/news.c:895
 msgid "can't get xhdr\n"
@@ -416,7 +415,7 @@ msgstr "nelze získat xhdr\n"
 
 #: libsylph/news.c:875 libsylph/news.c:907
 msgid "error occurred while getting xhdr.\n"
-msgstr "Během získávání xhdr se vyskytla chyba.\n"
+msgstr "během získávání xhdr se vyskytla chyba.\n"
 
 #: libsylph/nntp.c:68
 #, c-format
@@ -442,7 +441,7 @@ msgstr "Vyskytla se chyba během posílání příkazu\n"
 
 #: libsylph/pop.c:155
 msgid "Required APOP timestamp not found in greeting\n"
-msgstr "V pozdravu nebyla nalezena APOP časová značka\n"
+msgstr "V pozdravu nebyla nalezena časová značka APOP\n"
 
 #: libsylph/pop.c:162
 msgid "Timestamp syntax error in greeting\n"
@@ -465,7 +464,7 @@ msgstr "POP3: Vymazávání staré zprávy %d\n"
 #: libsylph/pop.c:634
 #, c-format
 msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: Přeskakuje se zpráva %d (%d bajtů)\n"
+msgstr "POP3: Přeskakuje se zpráva %d (bajtů %d)\n"
 
 #: libsylph/pop.c:667
 msgid "mailbox is locked\n"
@@ -500,7 +499,7 @@ msgstr "selhání při zápisu konfigurace do souboru\n"
 #: libsylph/prefs.c:239
 #, c-format
 msgid "Found %s\n"
-msgstr "Nalezený %s\n"
+msgstr "Nalezeno %s\n"
 
 #: libsylph/prefs.c:272
 msgid "Configuration is saved.\n"
@@ -530,11 +529,11 @@ msgstr "nelze načíst zprávu %d\n"
 #: libsylph/procmsg.c:1366
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
-msgstr "Neplatný příkaz k tisku: \"%s\"\n"
+msgstr "Neplatný příkaz při tisku: `%s'\n"
 
 #: libsylph/recv.c:140
 msgid "error occurred while retrieving data.\n"
-msgstr "Během obnovy dat se vyskytla chyba.\n"
+msgstr "během obnovy dat se vyskytla chyba.\n"
 
 #: libsylph/recv.c:182 libsylph/recv.c:214 libsylph/recv.c:229
 msgid "Can't write to file.\n"
@@ -600,15 +599,15 @@ msgstr "  Předmět: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Vydavatel: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
-msgstr "nelze změnit mód souboru\n"
+msgstr "nelze změnit práva souboru\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
-msgstr "Neúspěšný zápis do %s.\n"
+msgstr "neúspěšný zápis do %s.\n"
 
 #: src/about.c:91
 msgid "About"
@@ -619,7 +618,7 @@ msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>\n"
 "\n"
 msgstr ""
-"GPGME copyright (C) 2001 Werner Koch <dd9jn@gnu.org>.\n"
+"GPGME, copyright (C) 2001 Werner Koch <dd9jn@gnu.org>.\n"
 "\n"
 
 #: src/about.c:230
@@ -655,9 +654,9 @@ msgid ""
 "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
-"Kopii GNU General Public License jste měli obdržet spolu s tímto programem; "
-"pokud se tak nestalo, napište o ni Free Software Foundation, Inc., 59 Temple "
-"Place - Suite 330, Boston, MA 02111-1307, USA."
+"Kopii GNU General Public License jste měl(a) obdržet spolu s tímto "
+"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
 msgid ""
@@ -665,15 +664,15 @@ msgid ""
 "Please close all the composing windows before editing the accounts."
 msgstr ""
 "Jsou stále otevřena nějaká okna s rozepsanou zprávou.\n"
-"Před úpravou tohoto účtu zavřete prosím všechna tato okna."
+"Před úpravou účtů zavřete prosím všechna tato okna."
 
 #: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
-msgstr "Otevírá se okno úpravy účtu...\n"
+msgstr "Otevírá se okno nastavení účtu...\n"
 
 #: src/account_dialog.c:288
 msgid "Creating account edit window...\n"
-msgstr "Vytvářím okno úpravy účtu...\n"
+msgstr "Vytváří se okno nastavení účtu...\n"
 
 #: src/account_dialog.c:293
 msgid "Edit accounts"
@@ -684,11 +683,11 @@ msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
 msgstr ""
-"Nové zprávy budou kontrolovány v tomto pořadí. Pokud má být účet\n"
+"Nové zprávy budou kontrolovány v uvedeném pořadí. Pokud má být účet\n"
 "kontrolován při volbě \"Přijmout vše\", zaškrtněte políčko ve sloupci \"G\"."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -735,7 +734,7 @@ msgstr "Nelze načíst část zprávy."
 
 #: src/action.c:379
 msgid "Can't get part of multipart message"
-msgstr "Nelze získat část ze zprávy s více částmi"
+msgstr "Nelze načíst část ze zprávy s více částmi"
 
 #: src/action.c:472
 #, c-format
@@ -823,7 +822,7 @@ msgstr "Argument uživatele pro akci"
 msgid "Add Address to Book"
 msgstr "Přidat adresu do adresáře"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
@@ -836,7 +835,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku adresáře"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Soubor"
@@ -858,9 +857,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Soubor/Nový server _LDAP"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Soubor/---"
@@ -882,11 +881,11 @@ msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
@@ -923,7 +922,7 @@ msgstr "/_Adresa/U_pravit"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -932,12 +931,12 @@ msgstr "/_Nástroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat soubor _LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
@@ -971,20 +970,18 @@ msgid "/_Delete"
 msgstr "/_Smazat"
 
 #: src/addressbook.c:417
-#, fuzzy
 msgid "/_Copy"
-msgstr "/Kopí_rovat..."
+msgstr "/_Kopírovat"
 
 #: src/addressbook.c:418
-#, fuzzy
 msgid "/_Paste"
-msgstr "/Úp_ravy/V_ložit"
+msgstr "/_Vložit"
 
 #: src/addressbook.c:518
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Adresář"
 
@@ -1005,7 +1002,7 @@ msgstr "Kopie:"
 
 #: src/addressbook.c:679 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
-msgstr "Slepá kopie:"
+msgstr "Skrytá kopie:"
 
 #. Buttons
 #: src/addressbook.c:700 src/addressbook.c:1669 src/editaddress.c:719
@@ -1027,9 +1024,8 @@ msgid "Lookup"
 msgstr "Vyhledat"
 
 #: src/addressbook.c:709
-#, fuzzy
 msgid "_Close"
-msgstr "Barvy"
+msgstr "_Zavřít"
 
 #. Confirm deletion
 #: src/addressbook.c:879
@@ -1049,9 +1045,9 @@ msgstr ""
 "Chcete smazat složku A všechny adresy v \"%s\"?\n"
 "Pokud smažete pouze složku, adresy budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
-msgstr "Smazat složku "
+msgstr "Smazat složku"
 
 #: src/addressbook.c:1663
 msgid "_Folder only"
@@ -1091,7 +1087,7 @@ msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgstr ""
-"Konverze·adresáře nemohla být provedena,\n"
+"Konverze adresáře nemohla být provedena,\n"
 "ale byly vytvořeny nové prázdné soubory adresáře."
 
 #: src/addressbook.c:2473
@@ -1134,7 +1130,7 @@ msgstr "Starý adresář převeden, ale nelze uložit nový soubor index s adres
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
-"Konverze adresáře nemohla·být·provedena, ale byly vytvořeny nové prázdné "
+"Konverze adresáře nemohla být provedena, ale byly vytvořeny nové prázdné "
 "soubory adresáře."
 
 #: src/addressbook.c:2607
@@ -1201,21 +1197,21 @@ msgstr "Společné adresy"
 msgid "Personal address"
 msgstr "Osobní adresy"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Poznámka"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Varování"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Chyba"
 
 #: src/alertpanel.c:223
 msgid "Creating alert panel dialog...\n"
-msgstr "Vytvářím dialog pro varování...\n"
+msgstr "Vytváří se dialogové okno varování...\n"
 
 #: src/alertpanel.c:318
 msgid "Show this message next time"
@@ -1254,7 +1250,7 @@ msgstr "Hnědá"
 #. * so we can always get back the SummaryView pointer.
 #: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4875
 msgid "None"
-msgstr "Žádná"
+msgstr "Nespecifikováno"
 
 #: src/compose.c:536
 msgid "/_Add..."
@@ -1283,7 +1279,7 @@ msgstr "/_Soubor/Uložit do složky _konceptů"
 
 #: src/compose.c:552
 msgid "/_File/Save and _keep editing"
-msgstr "/_Soubor/Uložit a pok_račovat v editaci"
+msgstr "/_Soubor/Uložit a pok_račovat v úpravě"
 
 #: src/compose.c:555
 msgid "/_File/_Attach file"
@@ -1309,7 +1305,7 @@ msgstr "/Úp_ravy/_Zpět"
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
@@ -1322,7 +1318,7 @@ msgstr "/Úp_ravy/_Vyjmout"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Vložit jako _citaci"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vybr_at vše"
 
@@ -1338,7 +1334,7 @@ msgstr "/Úp_ravy/Zar_ovnat všechny dlouhé řádky"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/A_utomatické zarovnání"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/Z_obrazit"
@@ -1353,22 +1349,22 @@ msgstr "/Z_obrazit/_Odesílatel"
 
 #: src/compose.c:582
 msgid "/_View/_Bcc"
-msgstr "/Z_obrazit/S_lepá kopie"
+msgstr "/Z_obrazit/S_krytá kopie"
 
 #: src/compose.c:583
 msgid "/_View/_Reply to"
-msgstr "/Z_obrazit/_Adresa pro odpovědi"
+msgstr "/Z_obrazit/Odpovědi z_aslat na"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Z_obrazit/---"
 
 #: src/compose.c:585
 msgid "/_View/_Followup to"
-msgstr "/Z_obrazit/Pře_dat"
+msgstr "/Z_obrazit/Odpovědi _vystavit na"
 
 #: src/compose.c:587
 msgid "/_View/R_uler"
@@ -1382,123 +1378,123 @@ msgstr "/Z_obrazit/Přílo_ha"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Z_obrazit/Up_ravit nástrojovou lištu"
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Z_obrazit/Znaková _sada"
 
 #: src/compose.c:600
 msgid "/_View/Character _encoding/_Automatic"
-msgstr "/Z_obrazit/Znaková·_sada/_Automaticky rozpoznat"
+msgstr "/Z_obrazit/Znaková _sada/_Automaticky rozpoznat"
 
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Z_obrazit/Znaková _sada/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Z_obrazit/Znaková _sada/7bitový ASCII (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Z_obrazit/Znaková _sada/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Z_obrazit/Znaková _sada/Západoevropské jazyky (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Z_obrazit/Znaková _sada/Západoevropské jazyky (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Z_obrazit/Znaková _sada/Středoevropské jazyky (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Z_obrazit/Znaková _sada/Pobaltské jazyky (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Z_obrazit/Znaková _sada/Pobaltské jazyky (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Z_obrazit/Znaková _sada/Pobaltské jazyky (Windows-1257)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Z_obrazit/Znaková _sada/Řečtina (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Z_obrazit/Znaková _sada/Arabština (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Z_obrazit/Znaková _sada/Arabština (Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Z_obrazit/Znaková _sada/Hebrejština (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Z_obrazit/Znaková _sada/Hebrejština (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Z_obrazit/Znaková _sada/Turečtina (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (KOI8-_U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Z_obrazit/Znaková _sada/Cyrilice (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Z_obrazit/Znaková _sada/Japonština (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
-msgstr "/Z_obrazit/Znaková·_sada/Zjednodušená čínština (_GB2312)"
+msgstr "/Z_obrazit/Znaková _sada/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
-msgstr "/Z_obrazit/Znaková·_sada/Zjednodušená čínština (GBK)"
+msgstr "/Z_obrazit/Znaková _sada/Zjednodušená čínština (GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
-msgstr "/Z_obrazit/Znaková·_sada/Tradiční čínština (_Big5)"
+msgstr "/Z_obrazit/Znaková _sada/Tradiční čínština (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
-msgstr "/Z_obrazit/Znaková·_sada/Korejština (EUC-_KR)"
+msgstr "/Z_obrazit/Znaková _sada/Korejština (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
-msgstr "/Z_obrazit/Znaková·_sada/Thajština (TIS-620)"
+msgstr "/Z_obrazit/Znaková _sada/Thajština (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
-msgstr "/Z_obrazit/Znaková·_sada/Thajština (Windows-874)"
+msgstr "/Z_obrazit/Znaková _sada/Thajština (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/Adresá_ř"
 
@@ -1506,13 +1502,13 @@ msgstr "/_Nástroje/Adresá_ř"
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blona"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/_Akce"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
@@ -1531,7 +1527,7 @@ msgstr "/_Nástroje/Ši_frovat PGP"
 
 #: src/compose.c:696
 msgid "/_Tools/_Check spell"
-msgstr "/_Nástroje/Zkontrolovat pravopi_s"
+msgstr "/_Nástroje/Kontrolovat pravopi_s"
 
 #: src/compose.c:697
 msgid "/_Tools/_Set spell language"
@@ -1546,93 +1542,93 @@ msgstr "%s: soubor neexistuje\n"
 msgid "Can't get text part\n"
 msgstr "Nelze získat textovou část\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
-msgstr "Chyba v uvozovkách."
+msgstr "Chyba ve formátu uvozovek."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
-msgstr "Chyba formátu odpovědi/přeposlání."
+msgstr "Chyba formátu odpovědi/předání."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Soubor %s neexistuje\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nelze zjistit délku souboru %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Soubor %s je prázdný."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Nelze načíst %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Zpráva: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Nelze získat část ze zprávy s více částmi."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Žádný předmět)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Psaní zprávy%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Není uveden předmět"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Předmět je prázdný. Přesto odeslat?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
-msgstr "Nelze načíst seznam příjemců."
+msgstr "nelze načíst seznam příjemců."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
-"Není zadán účet pro odesílání mailů.\n"
-"Před odesláním vyberte prosím nějaký účet."
+"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:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Vyskytla se chyba při posílání zprávy na %s ."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Zprávu nelze uložit do odeslané pošty."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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\"."
+"Nelze vyhledat žádný klíč asociovaný s aktuálně vybraným ID klíče \"%s\"."
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1643,11 +1639,11 @@ msgstr ""
 "\n"
 "Přesto odeslat jako %s?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
-msgstr "Chyba při konverzi adresáře"
+msgstr "Chyba při konverzi kódu"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1655,22 +1651,20 @@ msgid ""
 "\n"
 "Send it anyway?"
 msgstr ""
-"Řádek %d překračuje svou maximální možnou délku·(998·bajtů).\n"
+"Řádek %d překračuje svou maximální možnou délku (998 bajtů).\n"
 "Obsah zprávy může být během přenosu poškozen.\n"
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Maximální délka řádku"
 
-#: src/compose.c:3245
-#, fuzzy
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
-msgstr "Šifrování s příjemci slepé kopie"
+msgstr "Šifrování s příjemci skryté kopie"
 
-#: src/compose.c:3246
-#, fuzzy
+#: src/compose.c:3254
 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 "
@@ -1678,139 +1672,139 @@ msgid ""
 "\n"
 "Send it anyway?"
 msgstr ""
-"Tato zpráva má příjemce slepé kopie. Pokud má být šifrována, všichni "
-"příjemci slepé kopie budou viditelní skrze seznam šifrovacího klíče, čímž "
-"dojde k jejich odkrytí.\n"
+"Tato zpráva má příjemce skryté kopie. Pokud má být šifrována, všichni "
+"příjemci skryté kopie budou viditelní skrze seznam šifrovacího klíče, čímž "
+"dojde k jejich prozrazení.\n"
 "\n"
 "Přesto odeslat?"
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "nelze smazat staré zprávy\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "zařazování zprávy...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
-msgstr "nelze vyhledat složku s frontou zpráv\n"
+msgstr "nelze vyhledat složku pozdržených zpráv\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "zprávu nelze zařadit\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
-msgstr "vytvářím ID zprávy: %s\n"
+msgstr "vytváří se ID zprávy: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
-msgstr "Vytvářím okno psaní zprávy...\n"
+msgstr "Vytváří se okno psaní zprávy...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "Podepsat PGP"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "Šifrovat PGP"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "Typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Délka"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Neplatný typ MIME."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
-msgstr "Špatný příkaz v externím editoru: \"%s\"\n"
+msgstr "Špatný příkaz v externím editoru: `%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process (pid: %d)?\n"
 msgstr ""
 "Externí editor stále pracuje.\n"
-"Vynutit přerušení procesu (číslo·procesu:·%d)?\n"
+"Vynutit přerušení procesu (číslo procesu: %d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr "_Upravit nástrojovou lištu..."
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Vybrat soubory"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Uložit zprávu"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 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:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "Zavřít _bez uložení"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu \"%s\"?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "Nahradit"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "Vložit"
 
@@ -1894,7 +1888,7 @@ msgstr "Soubor se zdá být v pořádku."
 
 #: src/editbook.c:123
 msgid "File does not appear to be a valid address book format."
-msgstr "Soubor není ve formátu adresáře."
+msgstr "Soubor není v platném formátu adresáře."
 
 #: src/editbook.c:126 src/editjpilot.c:204 src/editvcard.c:108
 msgid "Could not read file."
@@ -1968,12 +1962,12 @@ msgstr "Upravit složku"
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Zadejte název nové složky:"
 
@@ -2029,11 +2023,11 @@ msgstr " Otestovat server "
 
 #: src/editldap.c:342 src/editldap_basedn.c:188
 msgid "Search Base"
-msgstr "Báze pro hledání"
+msgstr "Vyhledávací báze"
 
 #: src/editldap.c:399
 msgid "Search Criteria"
-msgstr "Vyhledávací kritéria"
+msgstr "Kritéria hledání"
 
 #: src/editldap.c:406
 msgid " Reset "
@@ -2041,11 +2035,11 @@ msgstr " Reset "
 
 #: src/editldap.c:411
 msgid "Bind DN"
-msgstr "Bind DN"
+msgstr "DN uživatele"
 
 #: src/editldap.c:420
 msgid "Bind Password"
-msgstr "Heslo Bind"
+msgstr "Heslo"
 
 #: src/editldap.c:430
 msgid "Timeout (secs)"
@@ -2069,15 +2063,15 @@ msgstr "Přidat nový server LDAP"
 
 #: src/editldap_basedn.c:148
 msgid "Edit LDAP - Select Search Base"
-msgstr "Editace LDAP - Vyberte bázi pro hledání"
+msgstr "Úprava LDAP - Vyberte vyhledávací bázi"
 
 #: src/editldap_basedn.c:209
 msgid "Available Search Base(s)"
-msgstr "Dostupné báze pro hledání"
+msgstr "Dostupné vyhledávací báze"
 
 #: src/editldap_basedn.c:296
 msgid "Could not read Search Base(s) from server - please set manually"
-msgstr "Nelze načíst báze pro hledání ze serveru - zadejte je prosím ručně"
+msgstr "Ze serveru nelze načíst vyhledávací báze - zadejte je prosím ručně"
 
 #: src/editvcard.c:105
 msgid "File does not appear to be vCard format."
@@ -2140,42 +2134,42 @@ msgstr "Vybrat adresář"
 msgid "Select folder"
 msgstr "Vybrat složku"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Odeslaná pošta"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
-msgstr "Fronta"
+msgstr "Pozdržená pošta"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Koš"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" nemůže být obsaženo ve jméně složky."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
-msgstr "Složka \"%s\" už existuje."
+msgstr "Složka \"%s\" již existuje."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nelze vytvořit složku \"%s\"."
@@ -2210,7 +2204,7 @@ msgstr "/O_bnovit strom složek"
 
 #: src/folderview.c:257 src/folderview.c:281 src/folderview.c:303
 msgid "/_Update summary"
-msgstr "/Aktualizace sou_hrnu"
+msgstr "/Aktualizovat sou_hrn"
 
 #: src/folderview.c:259 src/folderview.c:283 src/folderview.c:305
 msgid "/Mar_k all read"
@@ -2222,7 +2216,7 @@ msgstr "/Na_jít zprávy..."
 
 #: src/folderview.c:262 src/folderview.c:286 src/folderview.c:308
 msgid "/Ed_it search condition..."
-msgstr "/Uprav_it·možnosti hledání..."
+msgstr "/Uprav_it možnosti hledání..."
 
 #: src/folderview.c:276 src/folderview.c:299
 msgid "/Down_load"
@@ -2252,7 +2246,7 @@ msgstr "Nepřečtené"
 
 #: src/folderview.c:440
 msgid "Total"
-msgstr ""
+msgstr "Celkem"
 
 #: src/folderview.c:573
 msgid "Setting folder info...\n"
@@ -2262,85 +2256,85 @@ msgstr "Nastavování informace o složce...\n"
 msgid "Setting folder info..."
 msgstr "Nastavování informace o složce..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledává se složka %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledává se složka %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom složek"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Strom složek bude obnoven. Pokračovat?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
-msgstr "Provádí se obnova stromu složek..."
+msgstr "Obnovuje se strom složek..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
-msgstr "Provádí se obnova stromu složek..."
+msgstr "Obnova stromu složek se nezdařila."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťují se nové zprávy ve všech složkách..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
-msgstr "Nevyžádaná pošta"
+msgstr "Nevyžádaná"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Je vybrána složka %s\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Stahují se zprávy v %s ..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Vyskytla se chyba při stahování zpráv v \"%s\"."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
 " append `/' at the end of the name)"
 msgstr ""
 "Zadejte název nové složky:\n"
-"(Pokud chcete vytvořit složku, která bude mít další\n"
+"(Pokud chcete vytvořit složku, která bude mít\n"
 "podsložky, přidejte na konec názvu \"/\".)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadejte nové jméno pro \"%s\":"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nelze přejmenovat složku \"%s\"."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nelze odstranit složku \"%s\"."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2349,11 +2343,11 @@ msgstr ""
 "Opravdu odebrat složku hledání \"%s\"?\n"
 "Skutečné zprávy nebudou smazány."
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Smazat složku hledání"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2366,20 +2360,20 @@ msgstr ""
 "\n"
 "Chcete je opravdu vymazat?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nelze odstranit složku \"%s\"."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Smazat všechny zprávy v koši?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2388,34 +2382,34 @@ msgstr ""
 "Opravdu odebrat poštovní schránku \"%s\"?\n"
 "(Zprávy NEBUDOU smazány z disku.)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Opravdu smazat účet IMAP4 \"%s\"?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Smazat účet IMAP4"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Opravdu chcete smazat diskusní skupinu \"%s\"?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Smazat diskusní skupinu"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Opravdu smazat účet diskusních skupin \"%s\"?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Smazat účet diskusních skupin"
 
@@ -2429,7 +2423,7 @@ msgstr "Předmět:"
 
 #: src/headerview.c:90
 msgid "Creating header view...\n"
-msgstr "Vytvářím náhled záhlaví...\n"
+msgstr "Vytváří se náhled záhlaví...\n"
 
 #: src/headerview.c:212 src/query_search.c:667 src/summaryview.c:2240
 msgid "(No From)"
@@ -2437,7 +2431,7 @@ msgstr "(není znám odesílatel)"
 
 #: src/imageview.c:55
 msgid "Creating image view...\n"
-msgstr "Vytvářím náhled obrázku...\n"
+msgstr "Vytváří se náhled obrázku...\n"
 
 #: src/imageview.c:109
 msgid "Can't load the image."
@@ -2493,7 +2487,7 @@ msgstr "Import souboru LDIF byl úspěšný."
 
 #: src/importldif.c:450
 msgid "Select LDIF File"
-msgstr "Výběr souboru LDIF"
+msgstr "Vyberte soubor LDIF"
 
 #: src/importldif.c:526
 msgid "File Name"
@@ -2559,144 +2553,144 @@ msgstr "Dokončit"
 #: src/inc.c:160
 #, c-format
 msgid "Sylpheed: %d new messages"
-msgstr "Sylpheed: %d nových zpráv"
+msgstr "Sylpheed: nových zpráv %d"
 
-#: src/inc.c:478
+#: src/inc.c:481
 msgid "Authenticating with POP3"
 msgstr "Autentizace přes POP3"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Přijímají se nové zprávy"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "V pohotovosti"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Přijímá se"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
-msgstr "Hotovo (%d zpráv (%s) přijato)"
+msgstr "Hotovo (zpráv %d, přijato [%s])"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Hotovo (nejsou žádné nové zprávy)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Autentizace selhala"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Zamknuto"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Čas vypršení"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
-msgstr "Dokončeno (%d nových zpráv)"
+msgstr "Dokončeno (nových zpráv %d)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
-msgstr "Dokončeno (nejsou nové zprávy)"
+msgstr "Dokončeno (žádné nové zprávy)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Během načítání zpráv se vyskytly chyby."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "získávájí se nové zprávy z účtu %s ...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autentizace přes POP3"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Přijímají se nové zprávy"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Připojování k serveru POP3: %s ..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nelze se spojit se serverem POP3: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Autentizace..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Přijímají se zprávy z %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Zjišťuje se počet nových zpráv (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Zjišťuje se počet nových zpráv (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Zjišťuje se počet nových zpráv (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Zjišťuje se počet zpráv (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Vymazávání zprávy %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Ukončování"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Načítá se zpráva (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
-msgstr "Přijímá se (%d zpráv (%s) přijato)"
+msgstr "Přijímá se (zpráv %d, přijato [%s])"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Spojení selhalo."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Během zpracovávání pošty se vyskytla chyba."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2705,28 +2699,28 @@ msgstr ""
 "Během zpracovávání pošty se vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Žádné volné místo na disku."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Nelze zapisovat do souboru."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
-msgstr "Chyba soketu."
+msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Spojení ukončeno vzdáleným hostitelem."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Poštovní schránka je zamčena."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2735,11 +2729,11 @@ msgstr ""
 "Poštovní schránka je zamčena:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Autentizace selhala."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2748,15 +2742,15 @@ msgstr ""
 "Autentizace selhala:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Vypršel čas relace."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Začleňování zrušeno\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Získávají se nové zprávy z %s do %s...\n"
@@ -2785,7 +2779,7 @@ msgstr "Použití: %s [VOLBY]...\n"
 
 #: src/main.c:427
 msgid "  --compose [address]    open composition window"
-msgstr "  --compose [adresa]     otevře okno psaní nové zprávy"
+msgstr "  --compose [adresa]            otevře okno psaní nové zprávy"
 
 #: src/main.c:428
 msgid ""
@@ -2794,54 +2788,56 @@ msgid ""
 "                         attached"
 msgstr ""
 "  --attach soubor1 [soubor2]...\n"
-"                           otevře okno psaní zprávy se zvolenými\n"
-"                           soubory jako přílohou"
+"                                otevře okno psaní zprávy se zvolenými\n"
+"                                soubory jako přílohou"
 
 #: src/main.c:431
 msgid "  --receive              receive new messages"
-msgstr "  --receive             načte nové zprávy"
+msgstr "  --receive                     načte nové zprávy"
 
 #: src/main.c:432
 msgid "  --receive-all          receive new messages of all accounts"
-msgstr "  --receive-all          načte všechny nové zprávy ze všech účtů"
+msgstr ""
+"  --receive-all                 načte všechny nové zprávy ze všech účtů"
 
 #: src/main.c:433
 msgid "  --send                 send all queued messages"
-msgstr "  --send              pošle všechny pozdržené zprávy"
+msgstr "  --send                        pošle všechny pozdržené zprávy"
 
 #: src/main.c:434
 msgid "  --status [folder]...   show the total number of messages"
-msgstr "  --status·[folder]...   vypíše celkový počet zpráv"
+msgstr "  --status [složka]...          vypíše celkový počet zpráv"
 
 #: src/main.c:435
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr ""
-"  --status-full [folder]...\n"
-"·························zobrazit stav každé ze složek"
+"  --status-full [složka]...\n"
+"                                zobrazí stav každé ze složek"
 
 #: src/main.c:437
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
-"  --configdir·dirname    zvolit adresář se soubory uživatelských předvoleb"
+"  --configdir adresář           zvolí adresář se soubory uživatelských "
+"předvoleb"
 
 #: src/main.c:438
 msgid "  --exit                 exit Sylpheed"
-msgstr "  --exit·················ukončit Sylpheed"
+msgstr "  --exit                        ukončí Sylpheed"
 
 #: src/main.c:439
 msgid "  --debug                debug mode"
-msgstr "  --debug              režim ladění"
+msgstr "  --debug                       režim ladění"
 
 #: src/main.c:440
 msgid "  --help                 display this help and exit"
-msgstr "  --help            vypíše tento text a skončí"
+msgstr "  --help                        vypíše tuto nápovědu a skončí"
 
 #: src/main.c:441
 msgid "  --version              output version information and exit"
-msgstr "  --version             vypíše informace o verzi a skončí"
+msgstr "  --version                     vypíše informace o verzi a skončí"
 
 #: src/main.c:445
 msgid "Press any key..."
@@ -2864,12 +2860,12 @@ msgid ""
 "\n"
 "Continue?"
 msgstr ""
-"Znaková sada lokalizace libc není UTF-8,·přitom proměnná prostředí "
-"·G_FILENAME_ENCODING·není nastavena.\n"
-"V případě, že je znaková sada lokalizace libc použita v názvu souboru či "
-"adresáře, nebude zajištěna správná funkce.\n"
+"Znaková sada lokalizace libc není UTF-8, přitom proměnná prostředí  "
+"G_FILENAME_ENCODING není nastavena.\n"
+"Pokud je znaková sada lokalizace libc použita v názvu souboru či adresáře, "
+"nebude zajištěna správná funkce.\n"
 "V tom případě je nutné nastavit následující proměnnou prostředí (podrobnosti "
-"viz·README):\n"
+"viz README):\n"
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 "\n"
@@ -2885,26 +2881,26 @@ msgstr "Pozdržené zprávy"
 
 #: src/main.c:653
 msgid "Some unsent messages are queued. Exit now?"
-msgstr "Ve frontě jsou neodeslané zprávy. Skončit nyní?"
+msgstr "Některé neodeslané zprávy jsou pozdržené. Skončit nyní?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
 msgstr ""
-"GnuPG není korektně instalováno nebo je verze příliš stará.\n"
-"Podpora pro OpenPGP je zakázána."
+"GnuPG není korektně instalováno nebo je příliš staré verze.\n"
+"Podpora OpenPGP je zakázána."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "aplikace Sylpheed je již spuštěna.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Přenesení uživatelských předvoleb"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2912,743 +2908,744 @@ msgstr ""
 "Bylo nalezeno dřívější uživatelské nastavení.\n"
 "Chcete ho přenést?"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Soubor/_Složka"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Soubor/_Složka/_Vytvořit novou složku..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Soubor/_Složka/_Přejmenovat složku..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Soubor/_Složka/Př_esunout složku..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Soubor/_Složka/_Smazat složku"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Soubor/_Poštovní schránka"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Soubor/_Poštovní schránka/Při_dat poštovní schránku...."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
-msgstr "/_Soubor/_Poštovní·schránka/Odebrat _poštovní schránku"
+msgstr "/_Soubor/_Poštovní schránka/Odebrat _poštovní schránku"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
-msgstr "/_Soubor/_Poštovní·schránka/---"
+msgstr "/_Soubor/_Poštovní schránka/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
-msgstr "/_Soubor/_Poštovní·schránka/_Zkontrolovat nové zprávy"
+msgstr "/_Soubor/_Poštovní schránka/_Zkontrolovat nové zprávy"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
-"/_Soubor/_Poštovní·schránka/Z_kontrolovat nové zprávy ve všech poštovních "
-"schránkách"
+"/_Soubor/_Poštovní schránka/Z_kontrolovat nové zprávy ve všech schránkách"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
-msgstr "/_Soubor/_Poštovní·schránka/O_bnovit strom složek"
+msgstr "/_Soubor/_Poštovní schránka/O_bnovit strom složek"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Soubor/_Importovat soubor mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Soubor/E_xportovat do souboru mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Soubor/V_yprázdnit všechny koše"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Soubor/Uložit j_ako..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 msgid "/_File/Page set_up..."
 msgstr "/_Soubor/Vzhled stránky..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Soubor/_Tisk..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Soubor/Pracovat o_ffline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Soubor/U_končit"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/Úp_ravy/Vybrat _vlákno"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/_Hledat v aktuální zprávě..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/Ú_pravy/Hledat zpráv_y..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Strom složek "
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Zobra_zení zpráv"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/Ikony _a text"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr ""
 "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/Text naprav_o od ikon"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Ikony"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Text"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/_Nástrojová lišta/_Nezobrazovat"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Lišta _hledání"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Z_obrazit/Zobrazit nebo s_krýt/Stavová _lišta"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Customize toolbar..."
 msgstr "/Z_obrazit/_Upravit nástrojovou lištu..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/Z_obrazit/Samostatný s_trom složek "
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/Z_obrazit/Samostatné zo_brazení zpráv"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/Z_obrazit/Setříd_it"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/Z_obrazit/Setříd_it/Podle čí_sla"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Z_obrazit/Setříd_it/Podle _velikosti"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/Z_obrazit/Setříd_it/Podle _data"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Z_obrazit/Setříd_it/Podle stáří vlákna"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/Z_obrazit/Setříd_it/Podle _odesílatele"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Z_obrazit/Setříd_it/Podle pří_jemce"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/Z_obrazit/Setříd_it/Podle př_edmětu"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/Z_obrazit/Setříd_it/Podle _barevného návěští"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/Z_obrazit/Setříd_it/Podle o_značení"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/Z_obrazit/Setříd_it/Podle ne_přečtených"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Z_obrazit/Setříd_it/Podle příloh_y"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Z_obrazit/Setříd_it/_Netřídit"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/Z_obrazit/Setříd_it/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/Z_obrazit/Setříd_it/Vzestupně"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/Z_obrazit/Setříd_it/Sestupně"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Z_obrazit/Setříd_it/_Získat z předmětu"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/Z_obrazit/Zobrazit _vlákna"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/Z_obrazit/Rozbalit vše_chna vlákna"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/Z_obrazit/Sbalit všechna vlákna"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/Z_obrazit/Nastavit zobrazené po_ložky..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/Z_obrazit/_Přejít"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Z_obrazit/_Přejít/Př_edchozí zpráva"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/Z_obrazit/_Přejít/Následující zpráva"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/Z_obrazit/_Přejít/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 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:620
+#: src/mainwindow.c:622
 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:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Z_obrazit/_Přejít/_Předchozí nová zpráva"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Z_obrazit/_Přejít/Následující n_ová zpráva"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Z_obrazit/_Přejít/Před_chozí označená zpráva"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 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:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Z_obrazit/_Přejít/Předchozí _zpráva s návěštím"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Z_obrazit/_Přejít/Nás_ledující zpráva s návěštím"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Z_obrazit/_Přejít/Do _jiné složky"
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Z_obrazit/_Znaková sada/_Automaticky rozpoznat"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Z_obrazit/_Znaková sada/Západoevropské jazyky (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Z_obrazit/_Znaková sada/Japonština (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Z_obrazit/_Znaková sada/Japonština (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Z_obrazit/_Znaková sada/Japonština (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Z_obrazit/_Znaková sada/Tradiční čínština (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Z_obrazit/_Znaková sada/Čínština (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejština (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/Z_obrazit/Otevřít v _novém okně"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/Z_obrazit/Zd_roj zprávy"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/Z_obrazit/Všechna zá_hlaví"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
-msgstr "/Z_obrazit/_Aktualizace souhrnu"
+msgstr "/Z_obrazit/_Aktualizovat souhrn"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Zpráva"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/_Zpráva/Přijmo_ut"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Zpráva/Přijmo_ut/Přijmout _z aktuálního účtu"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Zpráva/Přijmo_ut/Přijmout z_e všech účtů"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Zpráva/Přijmo_ut/Přerušit pří_jem zpráv"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Zpráva/Přijmo_ut/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Zpráva/Odeslat pozd_ržené zprávy"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Zpráva/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Zpráva/_Nová zpráva"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Zpráva/_Odpovědět"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Zpráva/Odpo_vědět komu"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Zpráva/Odpo_vědět komu/_Všem"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Zpráva/Odpo_vědět komu/_Odesílateli"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
-msgstr "/_Zpráva/Odpo_vědět komu/Do _elektronické konference"
+msgstr "/_Zpráva/Odpo_vědět komu/_Elektronické konferenci"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Zpráva/Předat dá_l"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Zpráva/Předat dál _jako přílohu"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Zpráva/Přesměrov_at"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Zpráva/Pře_sunout..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Zpráva/_Kopírovat..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Zpráva/Označ_it"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Zpráva/Označ_it/_Označit"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Zpráva/Označ_it/_Zrušit označení"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Zpráva/Označ_it/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Zpráva/Označ_it/Označit jako _nepřečtené"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Zpráva/Označ_it/Označit jako _přečtené"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Zpráva/Označ_it/Označit _vlákno jako přečtené"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Zpráva/Označ_it/Označit vš_e jako přečtené"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Zpráva/S_mazat"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Zpráva/Označi_t jako nevyžádanou poštu"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Zpráva/Označit jako _vyžádanou poštu"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Zpráva/Znov_u editovat"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Nástroje/Př_idat odesílatele do adresáře"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/Filtrovat všechny z_právy ve složce"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtrovat vybrané zprávy"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/_Vytvoření filtru"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/_Vytvoření filtru/_Automaticky"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/_Vytvoření filtru/Podle _odesílatele"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/_Vytvoření filtru/Podle pří_jemce"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/_Vytvoření filtru/Podle _předmětu"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Nástroje/Fi_ltrovat nevyžádanou poštu ve složce"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 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:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/_Smazat duplikované zprávy"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Nástroje/Spustit označený pro_ces"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/_Záznamový protokol"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/Nastav_ení"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_ení/_Společná nastavení..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_ení/Nastavení _filtrů..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_ení/Ša_blona..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_ení/_Akce..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/Nastav_ení/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_ení/Nas_tavení aktuálního účtu..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_ení/Založit _nový účet..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_ení/Ú_pravy účtů..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
-msgstr "/Nastav_ení/_Změna aktuálního účtu"
+msgstr "/Nastav_ení/_Změnit aktuální účet"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/Nápo_věda/_Manuál"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_věda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_věda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_věda/Č_asto kladené otázky"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
-msgstr "/Nápo_věda/Č_asto·kladené·otázky/_Anglicky"
+msgstr "/Nápo_věda/Č_asto kladené otázky/_Anglicky"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
-msgstr "/Nápo_věda/Č_asto·kladené·otázky/_Německy"
+msgstr "/Nápo_věda/Č_asto kladené otázky/_Německy"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
-msgstr "/Nápo_věda/Č_asto·kladené·otázky/Š_panělsky"
+msgstr "/Nápo_věda/Č_asto kladené otázky/Š_panělsky"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
-msgstr "/Nápo_věda/Č_asto·kladené·otázky/_Francouzsky"
+msgstr "/Nápo_věda/Č_asto kladené otázky/_Francouzsky"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
-msgstr "/Nápo_věda/Č_asto·kladené·otázky/_Italsky"
+msgstr "/Nápo_věda/Č_asto kladené otázky/_Italsky"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/Nápo_věda/Přepínače pří_kazové řádky"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/Nápo_věda/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Vytváří se hlavní okno...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Neoznačený"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "žádný"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
-msgstr "Měním typ oddělovače oken z %d na %d\n"
+msgstr "Mění se typ oddělovače oken z %d na %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Jste v režimu offline. Přejít do režimu online?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Vyprázdnit všechny koše"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Smazat všechny zprávy v koši?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Přidat poštovní schránku"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
-"Zadejte umístění poštovní schránky.\n"
-"Pokud je zadána již existující, bude automaticky\n"
-"prohledána."
+"Zadejte prosím umístění poštovní schránky.\n"
+"V případě zadání již existující bude tato\n"
+"automaticky prohledána."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštovní schránka \"%s\" již existuje."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Poštovní schránka"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there."
 msgstr ""
-"Vytváření poštovní schránky se nezdařilo.\n"
-"Může to být tím, že schránka již existuje, nebo nemáte dostatečná práva\n"
-"pro zápis."
+"Vytvoření poštovní schránky se nezdařilo.\n"
+"Může to být tím, že část schránky již existuje, nebo nemáte dostatečná "
+"práva\n"
+"na zápis."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Strom složek"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Odpovědět všem"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Odpovědět _odesílateli"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
-msgstr "/Odpovědět do _elektronické konference"
+msgstr "/Odpovědět _elektronické konferenci"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Předat dál _jako přílohu"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 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."
+msgstr "Jste v režimu offline. Klepnutím na ikonu přejdete do režimu online."
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 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."
+msgstr "Jste v režimu online. Klepnutím na ikonu přejdete do režimu offline."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Ukončit"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
-msgstr "Opravdu ukončit tento program?"
+msgstr "Opravdu ukončit Sylpheed?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Přepínače příkazové řádky"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Použití: sylpheed [VOLBY]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3676,7 +3673,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3691,18 +3688,18 @@ msgid ""
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
-"otevřít okno psaní zprávy\n"
-"otevřít okno psaní zprávy se zadanými soubory jako přílohou\n"
-"přijmout nové zprávy\n"
-"přijmout nové zprávy ze všech účtů\n"
-"odeslat všechny zprávy ve frontě\n"
-"zobrazit celkový počet zpráv\n"
-"zobrazit stav každé složky\n"
-"určit adresář se soubory uživatelského nastavení\n"
-"ukončit Sylpheed\n"
+"otevře okno psaní zprávy\n"
+"otevře okno psaní zprávy se zadanými soubory jako přílohou\n"
+"přijme nové zprávy\n"
+"přijme nové zprávy ze všech účtů\n"
+"odešle všechny pozdržené zprávy\n"
+"zobrazí celkový počet zpráv\n"
+"zobrazí stav každé složky\n"
+"určí adresář se soubory uživatelského nastavení\n"
+"ukončí Sylpheed\n"
 "režim ladění\n"
-"zobrazit tuto nápovědu a skončit\n"
-"vypsat informaci o verzi a skončit"
+"vypíše tuto nápovědu a skončí\n"
+"vypíše informace o verzi a skončí"
 
 #: src/message_search.c:120
 msgid "Find in current message"
@@ -3863,7 +3860,7 @@ msgid ""
 "If you want to launch it, save it to somewhere and make sure it is not an "
 "virus or something like a malicious program."
 msgstr ""
-"Toto je spustitelný soubor.·Otevření spustitelného souboru je z "
+"Toto je spustitelný soubor. Otevření spustitelného souboru je z "
 "bezpečnostních důvodů omezeno.\n"
 "Pokud chcete soubor spustit, nejprve jej uložte a ujistěte se, že nejde o "
 "virus či nějaký nebezpečný program."
@@ -3874,7 +3871,7 @@ msgstr "Heslo (fráze)"
 
 #: src/passphrase.c:248
 msgid "[no user id]"
-msgstr "[bez id uživatele]"
+msgstr "[bez uživatele]"
 
 #: src/passphrase.c:256
 #, c-format
@@ -3910,7 +3907,7 @@ msgstr "Účet%d"
 msgid "Preferences for new account"
 msgstr "Nastavení nového účtu"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Nastavení účtu"
 
@@ -3923,7 +3920,7 @@ msgid "Receive"
 msgstr "Příjem"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Odeslat"
 
@@ -4074,7 +4071,7 @@ msgstr "Při příjmu zkontrolovat pouze složku doručené pošty"
 
 #: src/prefs_account_dialog.c:999
 msgid "Filter new messages in INBOX on receiving"
-msgstr "Filtrovat zprávy v doručené poště při příjetí"
+msgstr "Filtrovat zprávy v doručené poště při příjmu"
 
 #: src/prefs_account_dialog.c:1001
 msgid "News"
@@ -4090,7 +4087,7 @@ msgstr "Neomezeně, pokud je zvoleno 0."
 
 #: src/prefs_account_dialog.c:1034
 msgid "`Get all' checks for new messages on this account"
-msgstr "Při volbě \"Přijmout vše\" zjistit, zda jsou nové zprávy"
+msgstr "Při volbě \"Přijmout vše\" zjistit, zda existují nové zprávy"
 
 #: src/prefs_account_dialog.c:1088 src/prefs_customheader.c:186
 msgid "Header"
@@ -4135,7 +4132,7 @@ msgstr "Autentizace s POP3 před odesláním"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Podpis"
 
@@ -4157,11 +4154,11 @@ msgstr "Kopie"
 
 #: src/prefs_account_dialog.c:1335
 msgid "Bcc"
-msgstr "Slepá kopie"
+msgstr "Skrytá kopie"
 
 #: src/prefs_account_dialog.c:1348
 msgid "Reply-To"
-msgstr "Adresa pro odpovědi"
+msgstr "Odpovědi zaslat na"
 
 #: src/prefs_account_dialog.c:1403
 msgid "PGP sign message by default"
@@ -4185,7 +4182,7 @@ msgstr "Použít čistý textový podpis"
 
 #: src/prefs_account_dialog.c:1416
 msgid "Sign key"
-msgstr "Klíč pro podpis"
+msgstr "Podpisový klíč"
 
 #: src/prefs_account_dialog.c:1424
 msgid "Use default GnuPG key"
@@ -4267,7 +4264,7 @@ msgstr "Určit název domény"
 
 #: src/prefs_account_dialog.c:1754
 msgid "IMAP server directory"
-msgstr "adresář pro server IMAP"
+msgstr "Adresář serveru IMAP"
 
 #: src/prefs_account_dialog.c:1764
 msgid "Only the subfolders of this directory will be displayed."
@@ -4369,23 +4366,23 @@ msgid ""
 "   %s for the text selection"
 msgstr ""
 "Název nabídky:\n"
-" Pokud chcete vytvořit podnabídku, použijte v názvu /.\n"
+" Pokud chcete vytvořit podnabídku, použijte v názvu \"/\".\n"
 "Příkazová řádka:\n"
-" Začíná na:\n"
-"   | pošle obsah zprávy nebo výběru do příkazu\n"
-"   > pošle uživatelem definovaný text do příkazu\n"
-"   * pošle uživatelem definovaný skrytý text do příkazu\n"
-" Končí na:\n"
-"   | nahradí tělo zprávy nebo výběru výstupem z příkazu\n"
+" Začíná-li na:\n"
+"   | odešle obsah těla zprávy nebo výběru do příkazu\n"
+"   > odešle uživatelem zadaný text do příkazu\n"
+"   * odešle uživatelem zadaný skrytý text do příkazu\n"
+" Končí-li na:\n"
+"   | nahradí tělo zprávy nebo výběr výstupem z příkazu\n"
 "   > vloží výstup příkazu bez nahrazení starého textu\n"
 "   & spustí příkaz asynchronně\n"
 " Použití:\n"
-"   %f pro název zprávy\n"
-"   %F pro seznam názvů souborů nebo vybraných zpráv\n"
-"   %p pro vybrané části zprávy\n"
-"   %u pro argument zadaný uživatelem\n"
-"   %h pro skrytý argument zadaný uživatelem\n"
-"   %s pro vybraný text"
+"   %f značí název souboru zprávy\n"
+"   %F značí seznam názvů souborů vybraných zpráv\n"
+"   %p značí vybranou část zprávy\n"
+"   %u značí argument zadaný uživatelem\n"
+"   %h značí skrytý argument zadaný uživatelem\n"
+"   %s značí výběr textu"
 
 #: src/prefs_actions.c:260
 msgid " Replace "
@@ -4585,7 +4582,7 @@ msgstr "Citovat zprávy při odpovídání"
 
 #: src/prefs_common_dialog.c:1043
 msgid "Reply button invokes mailing list reply"
-msgstr "Tlačítko s odpovědí zvolí odpověď do elektronické konference"
+msgstr "Tlačítko s odpovědí zvolí odpověď elektronické konferenci"
 
 #: src/prefs_common_dialog.c:1045
 msgid "Inherit recipients on reply to self messages"
@@ -4593,7 +4590,7 @@ msgstr "Dědit příjemce při odpovědi na vlastní zprávy"
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Editor"
 
@@ -4645,7 +4642,7 @@ msgstr "Uvozovka"
 #. forward
 #: src/prefs_common_dialog.c:1247
 msgid "Forward format"
-msgstr "Formát přeposlání"
+msgstr "Formát předání"
 
 #: src/prefs_common_dialog.c:1294
 msgid " Description of symbols "
@@ -4661,7 +4658,7 @@ msgstr "Výchozí jazyk:"
 
 #: src/prefs_common_dialog.c:1402
 msgid "Text font"
-msgstr "Font textu"
+msgstr "Písmo textu"
 
 #. ---- Folder View ----
 #: src/prefs_common_dialog.c:1414
@@ -4692,7 +4689,7 @@ msgstr "Souhrnný pohled"
 #: src/prefs_common_dialog.c:1463
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
-"Zobrazit příjemce ve sloupci \"Odesílatel\", jestliže jste odesílatel vy sám"
+"Zobrazit příjemce ve sloupci \"Odesílatel\", jestliže jste sám odesílatelem"
 
 #: src/prefs_common_dialog.c:1465
 msgid "Expand threads"
@@ -4805,7 +4802,7 @@ msgstr "Učit se příkazem:"
 
 #: src/prefs_common_dialog.c:1837
 msgid "(Select preset)"
-msgstr "(Vybrat přednastavení)"
+msgstr "(Vybrat předvolby)"
 
 #: src/prefs_common_dialog.c:1862
 msgid "Not Junk"
@@ -4918,15 +4915,15 @@ msgstr "Pořadí tlačítek vyhovující GNOME HIG."
 
 #: src/prefs_common_dialog.c:2164
 msgid "Display tray icon"
-msgstr "Zobrazit ikonu v oznamovací oblasti"
+msgstr "Zobrazit ikonu v systémové oblasti"
 
 #: src/prefs_common_dialog.c:2166
 msgid "Minimize to tray icon"
-msgstr "Minimalizovat do oznamovací oblasti"
+msgstr "Minimalizovat do systémové oblasti"
 
 #: src/prefs_common_dialog.c:2168
 msgid "Toggle window on trayicon click"
-msgstr "Vyvolat okno kliknutím na ikonu v oznamovací oblasti"
+msgstr "Vyvolat okno klepnutím na ikonu v systémové oblasti"
 
 #: src/prefs_common_dialog.c:2178
 msgid " Set key bindings... "
@@ -4970,7 +4967,7 @@ msgstr "Zavřít dialog o příjmu po dokončení"
 
 #: src/prefs_common_dialog.c:2283
 msgid "Add address to destination when double-clicked"
-msgstr "Přidat adresu do cíle dvojklikem"
+msgstr "Přidat adresu do cíle poklepáním"
 
 #: src/prefs_common_dialog.c:2285
 msgid "On exit"
@@ -4990,16 +4987,16 @@ msgstr "Potvrdit vyprázdnění"
 
 #: src/prefs_common_dialog.c:2306
 msgid "Warn if there are queued messages"
-msgstr "Varovat, pokud jsou zprávy ve frontě"
+msgstr "Varovat, pokud jsou některé zprávy pozdržené"
 
 #: src/prefs_common_dialog.c:2361
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Externí příkaz (%s bude nahrazeno jménem souboru nebo URI)"
+msgstr "Externí příkaz (\"%s\" bude nahrazeno jménem souboru nebo URI)"
 
 #: src/prefs_common_dialog.c:2370
 msgid "Web browser"
-msgstr "Internetový prohlížeč"
+msgstr "Webový prohlížeč"
 
 #: src/prefs_common_dialog.c:2382 src/prefs_common_dialog.c:3827
 #: src/prefs_common_dialog.c:3848
@@ -5033,7 +5030,7 @@ msgstr ""
 
 #: src/prefs_common_dialog.c:2536
 msgid "Socket I/O timeout:"
-msgstr "Čas vypršení V/V operací se soketem:"
+msgstr "Čas vypršení V/V operací se socketem:"
 
 #: src/prefs_common_dialog.c:2549
 msgid "second(s)"
@@ -5281,19 +5278,19 @@ msgstr "Rotovat barvy citací"
 
 #: src/prefs_common_dialog.c:3093
 msgid "Pick color for quotation level 1"
-msgstr "Zvolte barvu první úrovně citace"
+msgstr "Vyberte barvu první úrovně citace"
 
 #: src/prefs_common_dialog.c:3096
 msgid "Pick color for quotation level 2"
-msgstr "Zvolte barvu druhé úrovně citace"
+msgstr "Vyberte barvu druhé úrovně citace"
 
 #: src/prefs_common_dialog.c:3099
 msgid "Pick color for quotation level 3"
-msgstr "Zvolte barvu třetí úrovně citace"
+msgstr "Vyberte barvu třetí úrovně citace"
 
 #: src/prefs_common_dialog.c:3102
 msgid "Pick color for URI"
-msgstr "Zvolte barvu URI"
+msgstr "Vyberte barvu URI"
 
 #: src/prefs_common_dialog.c:3242
 msgid "Description of symbols"
@@ -5321,11 +5318,11 @@ msgstr ""
 "Příjemce\n"
 "Kopie\n"
 "Diskusní skupiny\n"
-"Číslo zprávy"
+"ID zprávy"
 
 #: src/prefs_common_dialog.c:3311
 msgid "If x is set, displays expr"
-msgstr "Pokud je zvoleno x, zobrazí se expr"
+msgstr "Pokud je zvoleno \"x\", zobrazí se \"expr\""
 
 #: src/prefs_common_dialog.c:3315
 msgid ""
@@ -5359,7 +5356,7 @@ msgstr "Klávesové zkratky"
 
 #: src/prefs_common_dialog.c:3382
 msgid "Select the preset of key bindings."
-msgstr "Vyberte si přednastavení klávesových zkratek."
+msgstr "Vyberte si předvolby klávesových zkratek."
 
 #: src/prefs_common_dialog.c:3392 src/prefs_common_dialog.c:3716
 msgid "Default"
@@ -5395,7 +5392,7 @@ msgstr "Opravdu chcete smazat toto záhlaví?"
 
 #: src/prefs_display_header.c:179
 msgid "Creating display header setting window...\n"
-msgstr "Vytvářím okno nastavení zobrazeného záhlaví...\n"
+msgstr "Vytváří se okno nastavení zobrazeného záhlaví...\n"
 
 #: src/prefs_display_header.c:203
 msgid "Display header setting"
@@ -5580,11 +5577,11 @@ msgstr "Smazat ze serveru"
 
 #: src/prefs_filter_edit.c:669
 msgid "Set mark"
-msgstr "Nastavit označení"
+msgstr "Označit"
 
 #: src/prefs_filter_edit.c:670
 msgid "Set color"
-msgstr "Nastavit barvu"
+msgstr "Opatřit barvou"
 
 #: src/prefs_filter_edit.c:671
 msgid "Mark as read"
@@ -5688,7 +5685,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Při odpovědi smazat ze začátku předmětu [...] nebo (...)"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Účet"
 
@@ -5702,12 +5699,12 @@ msgstr "použít také při odpovědi"
 
 #: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
-msgstr "Adresa pro odpovědi:"
+msgstr "Odpovědi zaslat na:"
 
 #: src/prefs_search_folder.c:164
 #, c-format
 msgid "%s - Edit search condition"
-msgstr "%s·-·Upravit možnosti hledání"
+msgstr "%s - Upravit možnosti hledání"
 
 #: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
@@ -5767,8 +5764,8 @@ msgid ""
 "Select items to be displayed on the summary view. You can modify\n"
 "the order by using the Up / Down button."
 msgstr ""
-"Vyberte položky, které chcete zobrazit v souhrnném pohledu. Můžete změnit\n"
-"pořadí pomocí tlačítek Nahoru nebo Dolů."
+"Vyberte položky, které chcete zobrazit v souhrnném pohledu. Pořadí\n"
+"můžete změnit pomocí tlačítek \"Nahoru\" nebo \"Dolů\"."
 
 #: src/prefs_template.c:164
 msgid "Template name"
@@ -5864,7 +5861,7 @@ msgstr "Označí jako nevyžádanou poštu"
 
 #: src/prefs_toolbar.c:66
 msgid "Not junk"
-msgstr "Vyžádaná pošta"
+msgstr "Vyžádaná"
 
 #: src/prefs_toolbar.c:67
 msgid "Set as not junk mail"
@@ -5884,7 +5881,7 @@ msgstr "Hledat"
 
 #: src/prefs_toolbar.c:76 src/query_search.c:251
 msgid "Search messages"
-msgstr "Vyhledat zprávy"
+msgstr "Hledat zprávy"
 
 #: src/prefs_toolbar.c:78 src/printing.c:526
 msgid "Print"
@@ -5894,85 +5891,95 @@ msgstr "Tisk"
 msgid "Print message"
 msgstr "Vytiskne zprávu"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Krok"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Server pro příjem"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Vykonat"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Spustí označený proces"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Nastavení"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Společná nastavení"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Odešle zprávu"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Odeslat později"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
-msgstr "Zařadí do výstupní fronty a odešle později"
+msgstr "Zařadí mezi pozdržené a odešle později"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Uloží do složky konceptů"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Vloží soubor"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Příloha"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Přiloží soubor"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Připojí podpis"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Upraví externím editorem"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Zarovnání"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Zarovná dlouhé řádky"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 msgid "Customize toolbar"
 msgstr "Upravit nástrojovou lištu"
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
 "the order by using the Up / Down button."
 msgstr ""
-"Vyberte položky, které chcete zobrazit na nástrojové liště. Můžete\n"
-"změnit pořadí pomocí tlačítek Nahoru nebo Dolů."
+"Vyberte položky, které chcete zobrazit na nástrojové liště. Pořadí\n"
+"můžete změnit pomocí tlačítek \"Nahoru\" nebo \"Dolů\"."
 
 #: src/printing.c:523
 msgid "The message will be printed with the following command:"
@@ -5989,11 +5996,11 @@ msgid ""
 "`%s'"
 msgstr ""
 "Příkazová řádka pro tisk je neplatná:\n"
-"\"%s\""
+"`%s'"
 
 #: src/progressdialog.c:58
 msgid "Creating progress dialog...\n"
-msgstr "Vytváří se dialog procesu...\n"
+msgstr "Vytváří se dialogové okno procesu...\n"
 
 #: src/progressdialog.c:136
 msgid "Status"
@@ -6015,7 +6022,7 @@ msgstr "Prohledává se %s ..."
 #: src/query_search.c:594
 #, c-format
 msgid "Searching %s (%d / %d)..."
-msgstr "Prohledává se·%s·(%d·/·%d)..."
+msgstr "Prohledává se %s (%d / %d)..."
 
 #: src/query_search.c:675 src/summaryview.c:2164
 msgid "(No Date)"
@@ -6035,10 +6042,10 @@ msgstr "Název složky:"
 
 #: src/rfc2015.c:144
 msgid "Cannot find user ID for this key."
-msgstr "Pro tento klíč nelze vyhledat ID uživatele."
+msgstr "Pro tento klíč nelze vyhledat uživatele."
 
 #: src/rfc2015.c:156
-#, fuzzy, c-format
+#, c-format
 msgid "\t\taka \"%s\"\n"
 msgstr "\t\taka \"%s\"\n"
 
@@ -6082,7 +6089,6 @@ msgid "Enter another user or key ID:"
 msgstr "Zadejte dalšího uživatele nebo ID klíče:"
 
 #: src/select-keys.c:486
-#, fuzzy
 msgid "Trust key"
 msgstr "Důvěryhodný klíč"
 
@@ -6110,12 +6116,12 @@ msgstr "Posílá se zpráva příkazem: %s\n"
 #: src/send_message.c:412
 #, c-format
 msgid "Can't execute command: %s"
-msgstr "Nelze vykonat externí příkaz: %s"
+msgstr "Nelze vykonat příkaz: %s"
 
 #: src/send_message.c:447
 #, c-format
 msgid "Error occurred while executing command: %s"
-msgstr "Během odesílání pošty se vyskytla chyba: %s"
+msgstr "Během vykonávání příkazu se vyskytla chyba: %s"
 
 #: src/send_message.c:564
 msgid "Connecting"
@@ -6165,7 +6171,7 @@ msgstr "Ukončování..."
 #: src/send_message.c:694
 #, c-format
 msgid "Sending message (%d / %d bytes)"
-msgstr "Posílá se zpráva (%d / %d bajtů)"
+msgstr "Posílá se zpráva (bajtů %d / %d)"
 
 #: src/send_message.c:725
 msgid "Sending message"
@@ -6193,16 +6199,16 @@ msgid ""
 "Specify the location of mailbox.\n"
 "If you are unsure, just select OK."
 msgstr ""
-"Zadejte umístění poštovní schránky.\n"
-"Pokud si nejste jisti, jednoduše zvolte Budiž."
+"Zadejte prosím umístění poštovní schránky.\n"
+"Pokud si nejste jisti, jednoduše zvolte \"Budiž\"."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
-msgstr "Zobrazit výsledek ověřování podpisu"
+msgstr "Výsledek ověřování podpisu"
 
 #: src/sigstatus.c:135
 msgid "Checking signature"
-msgstr "Kontrola podpisu"
+msgstr "Kontroluje se podpis"
 
 #: src/sigstatus.c:208
 #, c-format
@@ -6218,16 +6224,16 @@ msgstr "Podpis nenalezen"
 msgid "Good signature from \"%s\""
 msgstr "Správný podpis od \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Správný podpis"
 
 #: src/sigstatus.c:244
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
-msgstr "Platný podpis, ale klíč·\"%s\"·není důvěryhodný"
+msgstr "Platný podpis, ale klíč \"%s\" není důvěryhodný"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Platný podpis (nedůvěryhodný klíč)"
 
@@ -6243,7 +6249,7 @@ msgstr "Platný podpis, ale již vypršel"
 #: src/sigstatus.c:254
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
-msgstr "Platný podpis, ale podepisujícímu klíči \"%s\"·vypršela platnost"
+msgstr "Platný podpis, ale podepisujícímu klíči \"%s\" vypršela platnost"
 
 #: src/sigstatus.c:255
 msgid "Signature valid but the signing key has expired"
@@ -6263,7 +6269,7 @@ msgstr "Platný podpis, ale podepisující klíč byl odvolán"
 msgid "BAD signature from \"%s\""
 msgstr "ŠPATNÝ podpis od \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "ŠPATNÝ podpis"
 
@@ -6308,9 +6314,9 @@ msgstr ""
 "Certifikát SSL %s nemůže být ověřen z následujícího důvodu:\n"
 "  %s\n"
 "\n"
-"Server·certificate:\n"
-"  Subject:·%s\n"
-"  Issuer:·%s\n"
+"Certifikát serveru:\n"
+"  Předmět: %s\n"
+"  Vydavatel: %s\n"
 "\n"
 "Přijmete tento certifikát?"
 
@@ -6344,7 +6350,7 @@ msgstr "moderovaná"
 
 #: src/subscribedialog.c:428
 msgid "readonly"
-msgstr "pouze pro čtení"
+msgstr "pouze na čtení"
 
 #: src/subscribedialog.c:430
 msgid "unknown"
@@ -6361,7 +6367,7 @@ msgstr "Nelze načíst seznam diskusních skupin."
 #: src/subscribedialog.c:556
 #, c-format
 msgid "%d newsgroups received (%s read)"
-msgstr "%d diskusních skupin přijato (%s přečteno)"
+msgstr "přijatých diskusních skupin %d (přečtených %s)"
 
 #: src/summaryview.c:419
 msgid "/Repl_y to"
@@ -6377,7 +6383,7 @@ msgstr "/Odpovědět _komu/_Odesílateli"
 
 #: src/summaryview.c:422
 msgid "/Repl_y to/mailing _list"
-msgstr "/Odpovědět _komu/Do _elektronické konference"
+msgstr "/Odpovědět _komu/_Elektronické konferenci"
 
 #: src/summaryview.c:429
 msgid "/M_ove..."
@@ -6461,7 +6467,7 @@ msgstr "/_Vytvořit filtr/Podle _předmětu"
 
 #: src/summaryview.c:504
 msgid "Creating summary view...\n"
-msgstr "Vytváří se souhrnný pohled...\n"
+msgstr "Vytváří se souhrnné zobrazení...\n"
 
 #: src/summaryview.c:526
 msgid "All"
@@ -6477,7 +6483,7 @@ msgstr "S přílohou"
 
 #: src/summaryview.c:539
 msgid "Search:"
-msgstr "Vyhledat:"
+msgstr "Hledat:"
 
 #: src/summaryview.c:557
 msgid "Search for Subject or From"
@@ -6542,7 +6548,7 @@ msgstr "Nebyla nalezena žádná označená zpráva. Hledat od konce?"
 
 #: src/summaryview.c:1451 src/summaryview.c:1460
 msgid "No marked messages."
-msgstr "Žádná označená zpráva."
+msgstr "Žádné označené zprávy."
 
 #: src/summaryview.c:1458
 msgid "No marked message found. Search from the beginning?"
@@ -6558,7 +6564,7 @@ msgstr "Nebyla nalezena žádná zpráva s návěštím. Hledat od konce?"
 
 #: src/summaryview.c:1469 src/summaryview.c:1478
 msgid "No labeled messages."
-msgstr "Žádná zpráva s návěštím."
+msgstr "Žádné zprávy s návěštím."
 
 #: src/summaryview.c:1476
 msgid "No labeled message found. Search from the beginning?"
@@ -6571,12 +6577,12 @@ msgstr "Získávají se zprávy s předmětem..."
 #: src/summaryview.c:1986
 #, c-format
 msgid "%d deleted"
-msgstr "%d smazané"
+msgstr "smazaných %d"
 
 #: src/summaryview.c:1990
 #, c-format
 msgid "%s%d moved"
-msgstr "%s%d přemístěné"
+msgstr "přemístěných %s%d"
 
 #: src/summaryview.c:1991 src/summaryview.c:1996
 msgid ", "
@@ -6585,33 +6591,33 @@ msgstr ", "
 #: src/summaryview.c:1995
 #, c-format
 msgid "%s%d copied"
-msgstr "%s %d zkopírováno"
+msgstr "zkopírovaných %s%d"
 
 #: src/summaryview.c:2010
 msgid " item(s) selected"
-msgstr " položek vybráno"
+msgstr " vybraných položek"
 
 #: src/summaryview.c:2032
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
-msgstr "%d nových, %d nepřečtených, celkem %d (%s)"
+msgstr "nových %d, nepřečtených %d, celkem %d (%s)"
 
 #: src/summaryview.c:2036
 #, c-format
 msgid "%d new, %d unread, %d total"
-msgstr "%d nových, %d nepřečtených, %d celkem"
+msgstr "nových %d, nepřečtených %d, celkem %d"
 
 #: src/summaryview.c:2072
 msgid "Sorting summary..."
-msgstr "Celkové setřídění..."
+msgstr "Třídění souhrnu..."
 
 #: src/summaryview.c:2322
 msgid "\tSetting summary from message data..."
-msgstr "\tNastavování přehledu z dat zpráv..."
+msgstr "\tNastavování souhrnu z dat zpráv..."
 
 #: src/summaryview.c:2324
 msgid "Setting summary from message data..."
-msgstr "Nastavování přehledu z dat zpráv..."
+msgstr "Nastavování souhrnu z dat zpráv..."
 
 #: src/summaryview.c:2431
 #, c-format
@@ -6636,7 +6642,7 @@ msgstr "Zpráva %d je označena jako nepřečtená\n"
 #: src/summaryview.c:3098
 #, c-format
 msgid "Message %s/%d is set to delete\n"
-msgstr "Zpráva %s/%d je nastavena ke smazání\n"
+msgstr "Zpráva %s/%d je nastavena na smazání\n"
 
 #: src/summaryview.c:3126
 msgid "Delete message(s)"
@@ -6644,7 +6650,7 @@ msgstr "Smazat zprávy"
 
 #: src/summaryview.c:3127
 msgid "Do you really want to delete message(s) from the trash?"
-msgstr "Opravdu chcete vymazat tyto zprávy z koše?"
+msgstr "Opravdu chcete vymazat zprávy z koše?"
 
 #: src/summaryview.c:3201
 msgid "Deleting duplicated messages..."
@@ -6658,7 +6664,7 @@ msgstr "Zpráva %s/%d má zrušeno označení\n"
 #: src/summaryview.c:3299
 #, c-format
 msgid "Message %d is set to move to %s\n"
-msgstr "Zpráva %d je nastavena pro přesun do %s\n"
+msgstr "Zpráva %d je nastavena na přesun do %s\n"
 
 #: src/summaryview.c:3331
 msgid "Destination is same as current folder."
@@ -6667,7 +6673,7 @@ msgstr "Cílová položka je stejná jako aktuální složka."
 #: src/summaryview.c:3397
 #, c-format
 msgid "Message %d is set to copy to %s\n"
-msgstr "Zpráva %d je nastavena ke zkopírování do %s\n"
+msgstr "Zpráva %d je nastavena na zkopírování do %s\n"
 
 #: src/summaryview.c:3428
 msgid "Destination for copy is same as current folder."
@@ -6688,7 +6694,7 @@ msgstr "Ruší se vlákna..."
 #: src/summaryview.c:4361 src/summaryview.c:4422
 #, c-format
 msgid "Filtering (%d / %d)..."
-msgstr "Filtrování (%d·/·%d)..."
+msgstr "Filtrování (%d / %d)..."
 
 #: src/summaryview.c:4476
 msgid "filtering..."
@@ -6701,7 +6707,7 @@ msgstr "Filtrování..."
 #: src/summaryview.c:4514
 #, c-format
 msgid "%d message(s) have been filtered."
-msgstr "%d zpráv bylo filtrováno."
+msgstr "filtrovaných zpráv %d."
 
 #: src/summaryview.c:5023
 msgid "No."
@@ -6710,17 +6716,21 @@ msgstr "Č."
 #: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
-msgstr "soubor %s už existuje\n"
+msgstr "soubor %s již existuje\n"
 
 #: src/textview.c:249
 msgid "Creating text view...\n"
 msgstr "Vytváří se zobrazení textu...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Tato zpráva nemůže být zobrazena.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -6728,31 +6738,31 @@ msgstr ""
 "Tělo zprávy nemohlo být zobrazeno z důvodu selhání zápisu do dočasného "
 "souboru.\n"
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "Uložit o_brázek jako..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Napsat novou _zprávu"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Přidat do _adresáře..."
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "Kopí_rovat tuto adresu"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
-msgstr "Otevřít internetovým prohlížečem"
+msgstr "Otevřít webovým prohlížečem"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Kopírovat _tento odkaz"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6765,13 +6775,13 @@ msgstr ""
 "\n"
 "Přesto otevřít?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Varování - podvržená adresa"
 
 #: src/trayicon.c:139
 msgid "_Display Sylpheed"
-msgstr "_Zobrazit Sylpheed"
+msgstr "Zobrazit S_ylpheed"
 
 #: src/trayicon.c:144
 msgid "Get from _current account"
@@ -6792,15 +6802,3 @@ msgstr "Ukonči_t"
 #: src/trayicon.c:198 src/trayicon.c:289
 msgid "Sylpheed"
 msgstr "Sylpheed"
-
-#~ msgid "Edit address"
-#~ msgstr "Upravit adresu"
-
-#~ msgid " -> "
-#~ msgstr " -> "
-
-#~ msgid " <- "
-#~ msgstr " <- "
-
-#~ msgid "#"
-#~ msgstr "#"
diff --git a/po/da.po b/po/da.po
index c031b112..b84deb23 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -52,164 +52,164 @@ msgstr "Sender meddelelse (%d / %d bytes)"
 msgid "Moving messages %s to %s ..."
 msgstr "Flytter meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Modtager meddelelse fra %s..."
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan ikke sætte slettede flag: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "kan ikke slette\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Modtager meddelelse fra %s..."
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan ikke sætte slettet flag: 1:%d\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Markéret fil ikke fundet.\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "fejl ved modtagelse af LIST.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "kan ikke oprette '%s'\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan ikke oprette '%s'\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan ikke oprette mailbox: LIST fejlet\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "kan ikke oprette mailbox\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan ikke omdøbe mailbox: %s til %s\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "kan ikke slette mailbox\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "kan ikke modtage kovert\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "fejl ved modtagelse af kuvert.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan ikke læse kuvert: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "kan ikke modtage namespace\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 godkendelse fejlede.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fejlet.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan ikke tilføje %s til %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(sender fil...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "kan ikke tilføje meddelelse %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan ikke kopiere %s til %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fejl ved IMAP kommando: STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fejl ved IMAP kommand: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv can ikke konvertere %s til UTF-7\n"
@@ -301,20 +301,20 @@ msgstr "Eksporterer meddelelse fra %s til %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "kan ikke kopiere meddelelse %s til %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Kan ikke åbne markéret fil.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "fra og til mappe er ens.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -323,7 +323,7 @@ msgstr ""
 "Filen `%s' eksisterer allerede.\n"
 "Kan ikke oprette mappe."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -596,12 +596,12 @@ msgstr "  Emne: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Afsender: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "kan ikke ændre fil mode\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "fejl ved skrivning til %s.\n"
@@ -683,7 +683,7 @@ msgstr ""
 "`G'-kolonnen, for at aktivere hentning via `hent alle'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -820,7 +820,7 @@ msgstr "Handlingens bruger parameter"
 msgid "Add Address to Book"
 msgstr "Tilføj adresse i adressebog"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
@@ -833,7 +833,7 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Filer"
@@ -856,9 +856,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Filer/Ny _server"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Filer/---"
@@ -880,11 +880,11 @@ msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
@@ -921,7 +921,7 @@ msgstr "/_Adresse/_Redigér"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Funktioner"
@@ -930,12 +930,12 @@ msgstr "/_Funktioner"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
@@ -982,7 +982,7 @@ msgstr "/_Redigér/_Sæt ind"
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Adressebog"
 
@@ -1047,7 +1047,7 @@ msgstr ""
 "Vil du virkeligt slette mappen OG alla adresser i `%s' ? \n"
 "Hvis kun mappen slettes, vil adresserne blive flyttet til hoved mappen."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Slet mappe"
 
@@ -1201,15 +1201,15 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Note"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Fejl"
 
@@ -1314,7 +1314,7 @@ msgstr "/_Redigér/_Fortryd"
 msgid "/_Edit/_Redo"
 msgstr "/_Redigér/_Gentag"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Redigér/---"
@@ -1327,7 +1327,7 @@ msgstr "/_Redigér/_Klip"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigér/_Sæt ind som citat"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Redigér/Markér _alle"
 
@@ -1344,7 +1344,7 @@ msgstr "/_Redigér/Formater _alle lange linier"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigér/K_opiere"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Vis"
@@ -1366,9 +1366,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Vis/_Svar til"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Vis/---"
 
@@ -1389,7 +1389,7 @@ msgstr "/_Vis/_Vedhæft"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Vis/_Sortere/Faldende"
@@ -1401,138 +1401,138 @@ msgstr ""
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vis/_Tegnsæt/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vis/_Tegnsæt/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vis/_Tegnsæt/Central European (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vis/_Tegnsæt/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vis/_Tegnsæt/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vis/_Tegnsæt/Greek (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vis/_Tegnsæt/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vis/_Tegnsæt/Cyrillic (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vis/_Tegnsæt/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vis/_Tegnsæt/Thai (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vis/_Tegnsæt/Thai (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Funktioner/_Adressebog"
 
@@ -1540,13 +1540,13 @@ msgstr "/_Funktioner/_Adressebog"
 msgid "/_Tools/_Template"
 msgstr "/_Funktioner/_Skabelon"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Funktioner/---"
@@ -1585,71 +1585,71 @@ msgstr "%s: fil findes ikke\n"
 msgid "Can't get text part\n"
 msgstr "Kan ikke læse tekst afsnit\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Citat markérings format fejl."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Meddelelses svar / videresend fejl."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s findes ikke\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan ikke læse størrelse på %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s er tom."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "kan ikke læse %s"
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelelse: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Ny meddelelse%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Mangler modtager"
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 #, fuzzy
 msgid "Empty subject"
 msgstr "Emne"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Emne er tom. Send alligevel?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "Kan ikke åbne modtager liste."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1657,21 +1657,21 @@ msgstr ""
 "Konto til afsendelse af e-post er ikke valgt.\n"
 "Vælg konto før afsendelse er mulig."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Kan ikke gemme meddelelse i Sendt"
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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:3027
+#: src/compose.c:3035
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1682,12 +1682,12 @@ msgstr ""
 "%s til %s.\n"
 "Send den alligevel?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1696,15 +1696,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1713,85 +1713,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "kan ikke slette gammel meddelelse\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "meddelelse i kø...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "meddelelse kan ikke lægges i kø\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "genereret meddelelses ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Opretter instastnings vindue...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Funktioner/_Handlinger"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "MIME type"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1801,52 +1801,52 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -2004,12 +2004,12 @@ msgstr "Redigér mappe"
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -2177,42 +2177,42 @@ msgstr "Spool sti"
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Sendt"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kø"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Slettet"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Kladde"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "NyMappe"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kan ikke benyttes i mappe navn."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen `%s' eksisterer allerede."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan ikke oprette mappe `%s'."
@@ -2304,57 +2304,57 @@ msgstr "Indtast mappe information...\n"
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Genopbyg mappe træ"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Henter nye meddelelser i alle mapper..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappe %s er valgt\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2364,26 +2364,26 @@ msgstr ""
 "(hvis du vil oprette mappe til undermapper,,\n"
 "så afslut navn med `/')"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nyt navn for `%s':"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Omdøb mappe"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2392,12 +2392,12 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2408,21 +2408,21 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2431,34 +2431,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
@@ -2604,148 +2604,148 @@ msgstr "Slut"
 msgid "Sylpheed: %d new messages"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Godkender"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Modtager nu meddelelse"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Vent"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Modtager"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hentet (%d meddelelse(r) (%s)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Godkendelse mislykkedes"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:727
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hentet (%d nye meddelelse(r))"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Ingen nye meddelelser"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Fejl ved hentning af e-post."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "modtager nye meddelelser fra konto %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Godkender"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: henter nye meddelelser"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Forbinder til POP3 server: %s ..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ingen forbindelse med POP3 server: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Godkender..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Modtager meddelelse fra %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Modtager antal nye meddelelser (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Modtager antal nye meddelelser (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Modtager antal nye meddelelser (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Modtager antal nye meddelelser (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Afslutter"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Modtager meddelelse (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Henter (%d meddelelse(r), (%s) hentet"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 #, fuzzy
 msgid "Connection failed."
 msgstr "Forbindelse mislykkedes"
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 #, fuzzy
 msgid "Error occurred while processing mail."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2754,29 +2754,29 @@ msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Ingen fri disk plads."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Kan ikke skrive til fil."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Sokkel fejl."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "postkasse er låst\n"
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2785,11 +2785,11 @@ msgstr ""
 "Mailbox er låst:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Godkendelses fejlede."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2798,16 +2798,16 @@ msgstr ""
 "Godkendelsesfejl:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 #, fuzzy
 msgid "Session timed out."
 msgstr "tid udløbet\n"
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Hentning afbrudt\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Modtager nye meddelelser fra %s til %s...\n"
@@ -2932,7 +2932,7 @@ msgstr "Meddeleser i kø"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nogle usendte meddelelser i kø. Afslut nu?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2941,708 +2941,708 @@ msgstr ""
 "OpenPGP ikke mulig."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "sylpheed kører allerede.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Handlingsopsæt"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Filer/_Mappe"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Filer/_Mappe/Opret _ny mappe..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Filer/_Mappe/_Omdøb mappe..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Filer/_Mappe/_Omdøb mappe..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Filer/_Mappe/_Slet mappe"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Filer/_Tilføj mailbox..."
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Filer/_Tilføj mailbox..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Slet _mappe"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Filer/_Mappe/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "_Hent nye meddelelser"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Filer/_Mappe/_Hent nye meddelelser i alle mapper"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/G_endan mappe træ"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Filer/_Importere mbox fil..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Filer/_Eksportere mbox fil..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Filer/_Tøm slettet post"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Filer/_Gem som..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Filer/_Gem som..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Filer/_Udskriv..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Filer/_Indsæt fil"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Filer/_Afslut"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Redigér/Markér _tråd"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redigér/_Søg i aktuel meddelelse"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Søg meddelelser..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Vis/_Vis eller skjul"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vis/_Vis eller skjul/_Mappe træ"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vis/_Vis eller skjul/_Besked"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/Ikon _og tekst"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, 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:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ikon"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Tekst"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vis/_Vis eller skjul/_Værktøjslinie/_Ingen"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Vis/_Vis eller skjul/_Status linie"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vis/_Vis eller skjul/_Status linie"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vis/_Seperat mappe træ"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vis/Seperat m_eddelelses vindue"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Vis/_Sortere"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vis/_Sortere/_Nummer orden"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vis/_Sortere/_Størrelses orden"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vis/_Sortere/_Dato orden"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Vis/_Sortere/_Dato orden"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vis/_Sortere/_Fra orden"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vis/_Sortere/Efter _modtager"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vis/_Sortere/_Emne orden"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vis/_Sortere/_Farvet label orden"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vis/_Sortere/_Markéret orden"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vis/_Sortere/_Ulæst orden"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vis/_Sortere/_Vedhæft orden"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vis/_Sortere/Sorter _ikke"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Vis/_Sortere/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Vis/_Sortere/Stigende"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vis/_Sortere/_Emne orden"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Vis/_Trådet"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "_Vis/Åbn tråde"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vis/_Saml alle tråde"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Vis/_Sæt visning ..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Vis/_Gå til"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vis/_Gå til/_Forrige meddelelse"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vis/_Gå til/_Næste meddelelse"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Vis/_Gå til/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Vis/_Gå til/Forrige ulæste meddelelse"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vis/_Gå til/Næste ulæste meddelelse"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vis/_Gå til/_Forrige nye meddelelse"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vis/_Gå til/_Næste nye meddelelse"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vis/_Gå til/Forrige _markéret meddelelse"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vis/_Gå til/Næste  _markéret meddelelse"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vis/_Gå til/Forrige _label meddelelse"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vis/_Gå til/Næste _label meddelelse"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vis/_Tegnsæt/_Automatisk"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vis/_Tegnsæt/Western European (ISO-8859-_15)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vis/_TegnsætJapanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vis/_Tegnsæt/Japanese (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vis//_Tegnsæt/Japanese (_Shift_JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vis/_Tegnsæt/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vis/_Tegnsæt/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Vis/Åbn i nyt vindue"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Vis/_Kilde"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Vis/Alle _hoveder"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Vis/_Opdatér oversigt"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Meddelelse"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelelse/Hent fra _alle konti"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:755
 #, fuzzy
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Meddelelse/_Afbryd afsendelse"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelelse/Send meddelelser i _kø"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Meddelelse/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelelse/Opret _ny meddelelse"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Meddelelse/_Besvar"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelelse/_Svar til"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelelse/_Svar til/A_lle"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelelse/_Svar til/Af_sender"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelelse/_Svar til/_Alle"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Meddelelse/_Videresend"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelelse/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelelse/_Omdirigér"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelelse/_Flyt..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelelse/_Kopiere..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Meddelelse/_Markér"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelelse/_Markér/_Markér"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelelse/_Markér/_Slet markéring"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelelse/_Markér/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelelse/_Markér/Som ulæst"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelelse/_Markér/Som læst"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Meddelelse/_Markér/Som læst"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelelse/_Markér/Alle som læst"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Meddelelse/_Slet"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelelse/Hent _ny post"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelelse/Redigér _igen"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Funktioner/Tilføj afsender til adressebog"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Funktioner/_Opret filter"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Funktioner/_Opret filter/_Automatisk"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Funktioner/_Opret filter/Efter _Fra"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Funktioner/_Opret filter/Efter _Til"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Funktioner/_Opret filter/Efter _Emne"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Funktioner/_Filtrere meddelelse"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Meddelelse/Slet alle du_blikerede meddelelser"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Udfør markéret process"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/Funktioner/_Logbog vindue"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Opsæt"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Opsæt/Generelt _opsæt..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Opsæt/_Filter opsæt..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Opsæt/_Skabelon..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Opsæt/_Handlinger..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Opsæt/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Opsæt/_Den aktuelle konto..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Opsæt/_Opret ny konto..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Opsæt/_Redigér konti..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Opsæt/_Skift aktuel konto..."
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Hjælp/_Vejledning"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/_Vejledning/_Engelsk"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/_Vejledning/_Japansk"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/_Hjælp/_OSS"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjælp/_OSS/_Engelsk"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjælp/_OSS/_Tysk"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjælp/_OSS/_Spansk"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjælp/_OSS/_Fransk"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjælp/_OSS/_Italiensk"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Kommando linie ikke opsat."
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Hjælp/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Opretter hoved vindue...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "ingen"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Ændre vindue adskillelse type fra %d til %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tøm Slettet"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Ny mailbox"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3653,16 +3653,16 @@ msgstr ""
 "Hvis den eksisterende mailbox angives, vil den blive\n"
 "gennemsøgt automatisk."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3671,72 +3671,72 @@ msgstr ""
 "Fejl i oprettelse af mailbox.\n"
 "Måske findes filerne allerede eller du har ikke skrive rettighedder."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappe visning"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Svar"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Svar til alle"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Afslut"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Afslut program?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommando linie ikke opsat."
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Bruges som: %s [OPTION]...\n"
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3752,7 +3752,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3975,7 +3975,7 @@ msgstr "Konto%d"
 msgid "Preferences for new account"
 msgstr "Opsæt af ny konto"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Konto opsæt"
 
@@ -3988,7 +3988,7 @@ msgid "Receive"
 msgstr "Modtag"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Send"
 
@@ -4208,7 +4208,7 @@ msgstr "Godkend med POP3 før afsendelse"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Underskrift"
 
@@ -4674,7 +4674,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Editor"
 
@@ -5836,7 +5836,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Slet [...] og (...) i starten af Emne i besvarelser"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
@@ -6052,81 +6052,91 @@ msgstr "Udskriv"
 msgid "Print message"
 msgstr "Sende meddelelse"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Skrift"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Server til modtagelse"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Udfør"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Udfør markéret process"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Opsæt"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Generelt opsæt"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Sende meddelelse"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Send senere"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Læg i kø og send senere"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Kladde"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Gem i Kladde"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Indæst"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Insæt fil"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Vedhæft"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Vedhæft fil"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 #, fuzzy
 msgid "Append signature"
 msgstr "DÅRLIG underskrift"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Redigér med ekstern Editor"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Linie deling"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Vis/_Gå til/Anden _mappe..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6386,7 +6396,7 @@ msgstr "Underskrift ikke fundet"
 msgid "Good signature from \"%s\""
 msgstr "God underskrift fra \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Underskrift OK"
 
@@ -6395,7 +6405,7 @@ msgstr "Underskrift OK"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6432,7 +6442,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "DÅRLIG underskrift fra \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "DÅRLIG underskrift"
 
@@ -6891,47 +6901,51 @@ msgstr "filen %s eksisterer allerede\n"
 msgid "Creating text view...\n"
 msgstr "Opretter tekst vindue...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "en meddelelse vil ikke blive modtaget\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Gem som..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Opret ny meddelelse"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Tilføj afsender til adressebo_g"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Normale adresser"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web browser"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6940,7 +6954,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 37438161..f04673ab 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2006-12-09 08:22+0100\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -53,161 +53,161 @@ msgstr "Hänge Nachricht an %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "Verschiebe Nachrichten %s nach %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiere Nachrichten %s nach %s ..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Entferne Nachrichten von %s..."
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kann gelöschte Flags nicht setzen: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "kann nicht löschen\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Entferne alle Nachrichten in %s..."
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kann gelöschte Flags nicht setzen: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "kann Ablage nicht schließen\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "Wurzelverzeichnis %s existiert nicht\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "Fehler beim Empfang von LIST.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kann '%s' nicht erstellen\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Kann '%s' in INBOX nicht erstellen\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kann Mailbox nicht erstellen: LIST fehlgeschlagen\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "kann Mailbox nicht erstellen\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kann Mailbox %s nicht in %s umbenennen\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "kann Mailbox nicht löschen\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "kann die Nachrichteneigenschaften nicht empfangen\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Hole Nachrichtenkopfzeilen (%d / %d bytes)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "Fehler beim Empfang der Nachrichteneigenschaften.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kann die Nachrichteneigenschaften nicht bearbeiten: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "kann Namensraum nicht empfangen\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kann Ablage %s nicht auswählen\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "Fehler beim IMAP-Befehl: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-Beglaubigung fehlgeschlagen.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fehlgeschlagen.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kann %s nicht an %s anhängen\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(Datei versenden...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kann Nachricht nicht anhängen an %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kann %s nicht nach %s kopieren\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fehler beim IMAP-Befehl: STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fehler beim IMAP-Befehl: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "Fehler beim IMAP-Befehl: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kann %s nicht nach UTF-7  konvertieren\n"
@@ -299,20 +299,20 @@ msgstr "Exportiere Nachrichten von %s in %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "kann Nachricht %s nicht nach %s kopieren\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Kann markierte Datei nicht öffnen.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "Die Quellablage ist identisch mit dem Ziel.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiere Nachricht %s%c%d nach %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -321,7 +321,7 @@ msgstr ""
 "Datei '%s' existiert bereits.\n"
 "Kann Ablage nicht erstellen."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -595,12 +595,12 @@ msgstr "  Betreff: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Aussteller(in): %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "kann Dateimodus nicht ändern\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "Schreiben in %s fehlgeschlagen.\n"
@@ -685,7 +685,7 @@ msgstr ""
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -820,7 +820,7 @@ msgstr "Aktionen Benutzer-Parameter"
 msgid "Add Address to Book"
 msgstr "Adresse in Adressbuch einfügen"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
@@ -833,7 +833,7 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datei"
@@ -855,9 +855,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Datei/Neuer _LDAP-Server"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Datei/---"
@@ -879,11 +879,11 @@ msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
@@ -920,7 +920,7 @@ msgstr "/_Adresse/_Bearbeiten"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Werkzeug"
@@ -929,12 +929,12 @@ msgstr "/_Werkzeug"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
@@ -981,7 +981,7 @@ msgstr "/_Bearbeiten/_Einfügen"
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Adressbuch"
 
@@ -1047,7 +1047,7 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
@@ -1205,15 +1205,15 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Notiz"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Fehler"
 
@@ -1313,7 +1313,7 @@ msgstr "/_Bearbeiten/_Zurück"
 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
@@ -1326,7 +1326,7 @@ msgstr "/_Bearbeiten/_Ausschneiden"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Bearbeiten/Als Zitat _einfügen"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/Alle au_swählen"
 
@@ -1342,7 +1342,7 @@ msgstr "/_Bearbeiten/Alle langen Zeilen _umbrechen"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Aut_omatisches umbrechen"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Ansicht"
@@ -1364,9 +1364,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ansicht/A_ntwort an"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Ansicht/---"
 
@@ -1387,7 +1387,7 @@ msgstr "/_Ansicht/An_hang"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ansicht/_Gehe zu/Anderer Ab_lage..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Ansicht/_Zeichensatz"
 
@@ -1398,112 +1398,112 @@ msgstr "/_Ansicht/_Zeichensatz/_Automatisch"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ansicht/_Zeichensatz/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/_Zeichensatz/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ansicht/_Zeichensatz/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/_Zeichensatz/Zentral Europa (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/_Zeichensatz/_Baltisch (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/_Zeichensatz/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ansicht/_Zeichensatz/Baltisch (Windows-1257)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/_Zeichensatz/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ansicht/_Zeichensatz/Arabisch (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ansicht/_Zeichensatz/Arabisch (Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ansicht/_Zeichensatz/Griechisch (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ansicht/_Zeichensatz/Hebräisch (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/_Zeichensatz/Türkisch (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (KOI8-_U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/_Zeichensatz/Kyrillisch (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/_Zeichensatz/Einfaches Chinesisch (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ansicht/_Zeichensatz/Einfaches Chinesisch (_GB2312)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/_Zeichensatz/Traditionelles Chinesisch (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/_Zeichensatz/Koreanisch (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/_Zeichensatz/Thai (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Werkzeug/_Adressbuch"
 
@@ -1511,13 +1511,13 @@ msgstr "/_Werkzeug/_Adressbuch"
 msgid "/_Tools/_Template"
 msgstr "/_Werkzeug/_Schablone"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Werkzeug/Aktio_nen"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Werkzeug/---"
@@ -1551,70 +1551,70 @@ msgstr "%s: Datei existiert nicht\n"
 msgid "Can't get text part\n"
 msgstr "Kann Textabschnitt nicht lesen\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Formatfehler in Nachrichtenantwort oder -Weiterleitung."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datei %s existiert nicht\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kann Dateigröße von %s nicht ermitteln\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Verfassen%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Leerer Betreff"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem verschicken?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "Kann die Empfängerliste nicht holen."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1622,21 +1622,21 @@ msgstr ""
 "Account zum Versenden von E-Mails, wurde nicht angegeben.\n"
 "Bitte wählen sie einen E-Mail-Account vor dem Senden."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Kann die Nachricht nicht in der Gesendet-Ablage speichern."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1647,11 +1647,11 @@ msgstr ""
 "\n"
 "Dennoch mit %s senden?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Zeichensatz-Konvertierungs-Fehler"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1664,15 +1664,15 @@ msgstr ""
 "\n"
 "Dennoch senden?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "maximale Zeilenlänge"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr "Mit Bcc verschlüsseln"
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1686,83 +1686,83 @@ msgstr ""
 "\n"
 " Dennoch versenden? "
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "Kann die alte Nachricht nicht entfernen\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "Nachricht einreihen...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "kann Queue-Ablage nicht finden\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "Nachricht kann nicht eingereiht werden\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "erzeugte Nachrichten-ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Erstelle Verfassenfenster...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "PGP Unterschreiben"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "MIME-Typ"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Größe"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Kommandozeile für den externen Editor ist ungültig: '%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1771,48 +1771,48 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -1969,12 +1969,12 @@ msgstr "Ablage bearbeiten"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -2141,42 +2141,42 @@ msgstr "Wähle Verzeichnis"
 msgid "Select folder"
 msgstr "Wähle Ablage"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Warteschlange"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "NeueAblage"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' kann nicht in den Ablagenamen integriert werden."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage '%s' existiert bereits."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage '%s' nicht erstellen."
@@ -2263,56 +2263,56 @@ msgstr "Setze Ablageinformation...\n"
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Ablagebaum erneuern"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Der Ablagebaum wird erneuert. Weiter?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Ablagenbaum erneuern..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ablagenbaum erneuern fehlgeschlagen..."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ablagen auf neue Nachrichten prüfen..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ablage %s ist gewählt\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Lade Nachrichten nach %s ..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in '%s' ."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2322,26 +2322,26 @@ msgstr ""
 "(wenn Sie eine Ablage zum Speichern von Unterablagen erstellen wollen,\n"
 "dann hängen Sie ein `/' an das Ende des Namens)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name für '%s':"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kann Ablage '%s' nicht umbenennen."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kann Ablage '%s' nicht verschieben."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2350,11 +2350,11 @@ msgstr ""
 "Suchablage '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Suchablage löschen"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2367,20 +2367,20 @@ msgstr ""
 "\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kann Ablage '%s' nicht entfernen."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2389,34 +2389,34 @@ msgstr ""
 "Mailbox '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup '%s' wirklich löschen?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "News-Account löschen"
 
@@ -2563,142 +2563,142 @@ msgstr "Ende"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d neue Nachricht(en)"
 
-#: src/inc.c:478
+#: src/inc.c:481
 msgid "Authenticating with POP3"
 msgstr "Beglaubigen mit POP3"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Empfange neue Nachricht"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Warten"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Empfange"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Fertig (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Fertig (keine neuen Nachrichten)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Beglaubigung fehlgeschlagen"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Blockiert"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Beendet (%d neue Nachricht(en))"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Beendet (keine neuen Nachrichten)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Fehler während des Empfanges der E-Mails."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "erhalte neue Nachrichten vom Account %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Beglaubigen mit POP3"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Empfange neue Nachrichten"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinde mit POP3-Server: %s..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Beglaubigen..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Erhaltene Nachrichten von %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Bekomme Anzahl der neuen Nachrichten (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Lösche Nachricht %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Beenden"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Empfange (%d Nachricht(en) (%s) empfangen)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Fehler beim Verarbeiten der E-Mail."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2707,28 +2707,28 @@ msgstr ""
 "Fehler beim Verarbeiten der E-Mail:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Kein Platz mehr auf der Festplatte."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Kann Datei nicht schreiben."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Socket-Fehler."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Verbindung geschlossen vom Remote-Host."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Mailbox ist blockiert."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2737,11 +2737,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Beglaubigung fehlgeschlagen."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2750,15 +2750,15 @@ msgstr ""
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Sitzungszeit abgelaufen."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Empfangen abgebrochen\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Erhalte neue Nachrichten von %s in %s...\n"
@@ -2890,7 +2890,7 @@ msgstr "Wartende Nachrichten"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Einige ungesendete Nachrichten vorhanden. Jetzt beenden?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2899,15 +2899,15 @@ msgstr ""
 "OpenPGP-Unterstützung ausgeschaltet"
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "Ein anderes Sylpheed läuft schon.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Konfigurationsmigration"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2915,655 +2915,656 @@ msgstr ""
 "Ein frühere Konfiguration wurde gefunden.\n"
 "Soll sie migriert werden?"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Datei/Ab_lage"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datei/Ab_lage/_Neue Ablage erstellen..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datei/Ab_lage/Ablage _umbenennen..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datei/Ab_lage/Ablage _verschieben..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datei/Ab_lage/Ablage _löschen"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Datei/_Mailbox"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datei/_Mailbox/Mailbox _hinzufügen..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Datei/_Mailbox/Mailbox _entfernen"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datei/_Mailbox/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Datei/_Mailbox/Auf neue Nachrichten _prüfen"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Datei/_Mailbox/_Alle Ablagen auf neue Nachrichten prüfen"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "//_Datei/_Mailbox/Ablagebaum _erneuern"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datei/_Importiere Mbox-Datei..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datei/_Exportiere in Mbox-Datei..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Datei/Alle _Papierkörbe leeren"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Datei/Speichern _als..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Datei/Speichern _als..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Datei/_Drucken..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Datei/_Ohne Verbindung arbeiten"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Datei/_Beenden"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Bearbeiten/_Thread auswählen"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Bearbeiten/_Aktuelle Nachricht durchsuchen..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Bearbeiten/_Suche Nachrichten..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Ansicht/Zeigen oder _Verstecken"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/Ablagebaum"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Nachrichtenansicht"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste/Bilder _und Text"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste/_Bilder"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste/_Bilder"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste/_Text"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Werkzeugleiste/_Nichts"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Suchleiste"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ansicht/Zeigen oder _Verstecken/_Statuszeile"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Ansicht/_Gehe zu/Anderer Ab_lage..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ansicht/Einzelner _Ablagebaum"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/_Ansicht/Einzelne _Nachrichtenansicht"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Ansicht/_Sortieren"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ansicht/_Sortieren/nach _Nummer"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ansicht/_Sortieren/nach _Größe"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ansicht/_Sortieren/nach _Datum"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Ansicht/_Sortieren/nach _Threaddatum"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ansicht/_Sortieren/nach _Absender"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ansicht/_Sortieren/nach _Sender"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ansicht/_Sortieren/nach _Betreff"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ansicht/_Sortieren/nach _Farbetikett"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ansicht/_Sortieren/nach _Markierung"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ansicht/_Sortieren/nach _Ungelesen"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ansicht/_Sortieren/nach An_hang"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ansicht/_Sortieren/Nicht S_ortieren"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Ansicht/_Sortieren/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ansicht/_Sortieren/Aufsteigend"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ansicht/_Sortieren/Absteigend"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ansicht/_Sortieren/Threads nach Betreff _aufbauen"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Ansicht/_Threads einschalten"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ansicht/Alle Threads entfalten"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ansicht/Alle Threads zusammenfalten"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Ansicht/Anzuzeigende _Informationen setzen..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Ansicht/Gehe _zu"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ansicht/Gehe _zu/_Vorheriger Nachricht"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ansicht/Gehe _zu/_Nächster Nachricht"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Ansicht/_Gehe _zu/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ansicht/Gehe _zu/V_orheriger ungelesener Nachricht"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ansicht/Gehe _zu/N_ächster ungelesener Nachricht"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger ne_uer Nachricht"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ansicht/Gehe _zu/Nächster _neuer Nachricht"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger _markierter Nachricht"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ansicht/Gehe _zu/Nächster m_arkierter Nachricht"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger _etikettierter Nachricht"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ansicht/Gehe _zu/Nächster e_tikettierter Nachricht"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ansicht/_Gehe zu/Anderer Ab_lage..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ansicht/_Zeichensatz/_Automatische Erkennung"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ansicht/_Zeichensatz/West Europa (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ansicht/_Zeichensatz/Japanisch (_Shift_JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/_Zeichensatz/Traditionelles Chinesisch (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ansicht/_Zeichensatz/Chinesisch (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ansicht/_Zeichensatz/Koreanisch (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/Öffnen in _neuem Fenster"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Ansicht/Nachrichten_quelle"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/_Ansicht/_Alle Kopfzeilen anzeigen"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Ansicht/Akt_ualisiere Ablageninhalt"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Nachricht"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/_Nachricht/Empfang"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Nachricht/Empfang/Empfange vom aktuellen Account"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Nachricht/Empfang/Empfange von _allen Accounts"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Nachricht/Empfang/Empfan_g abbrechen"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Nachricht/Empfang/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Nachricht/Sende _wartende Nachrichten"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Nachricht/Verfasse n_eue Nachricht"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Nachricht/An_twort"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Nachricht/Ant_wort an"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Nachricht/Ant_wort an/_Alle"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Nachricht/Ant_wort an/Ab_sender"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Nachricht/Ant_wort an/Mailing-_Liste"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Nachricht/We_iterleiten"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Nachricht/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Nachricht/_Umadressieren"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Nachricht/_Verschieben..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Nachricht/_Kopieren..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Nachricht/_Markieren"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Nachricht/_Markieren/_Markieren"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Nachricht/_Markieren/Markierung _entfernen"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Nachricht/_Markieren/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Nachricht/_Markieren/Als _ungelesen"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Nachricht/_Markieren/Als _gelesen"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Nachricht/_Markieren/_Thread als gelesen markieren"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Nachricht/_Markieren/Alle _als gelesen"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Nachricht/_Löschen"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Nachricht/Markiere als Spam-Mail"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Nachricht/Markiere als Nicht-Spam-Mail"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Nachricht/Wieder_bearbeiten"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Werkzeug/Absender in Adress_buch einfügen"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Werkzeug/Alle Nachrichten einer Ablage _filtern"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Werkzeug/Aus_gewählte Nachrichten filtern"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Werkzeug/Filter _erstellen"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Werkzeug/Filter _erstellen/_Automatisch"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Von"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Werkzeug/Filter _erstellen/nach A_n"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Werkzeug/Filter _erstellen/nach _Betreff"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Werkzeug/Nachrichten einer Ablage nach Spams _filtern"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Werkzeug/Aus_gewählte Nachrichten nach Spams filtern"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Werkzeug/_Lösche mehrfach vorhandene Nachrichten"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Markierten Prozess ausführen"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Werkzeug/L_ogbuch-Fenster"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Einstellungen"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Einstellungen/Allgemeine _Einstellungen..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Einstellungen/_Filtereinstellungen..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Einstellungen/_Schablone..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Einstellungen/Aktionen..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Einstellungen/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Einstellungen/_Einstellungen für den aktuellen Account..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Einstellungen/_Neuen Account erstellen..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Einstellungen/Accounts _bearbeiten..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Einstellungen/Aktuellen Account _wechseln..."
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Hilfe/_Anleitung"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hilfe/Anleitung/_English"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hilfe/Anleitung/_Japanese"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/_Hilfe/_FAQ"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hilfe/_FAQ/_English"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hilfe/_FAQ/_German"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hilfe/_FAQ/_Spanish"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hilfe/_FAQ/_French"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hilfe/_FAQ/_Italian"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/_Hilfe/_Kommandozeilenoptionen"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Hilfe/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Erstelle Hauptfenster...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "nicht"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Wechsle Fenstertrennungstyp von %d zu %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Verbindungslos"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Sie sind nicht verbunden. Verbinden?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Leere alle Papierkörbe"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Lösche alle Nachrichten in den Papierkörben?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3573,16 +3574,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wurde, wird\n"
 "sie automatisch durchsucht."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3591,67 +3592,67 @@ msgstr ""
 "Erstellen der Mailbox fehlgeschlagen.\n"
 "Vielleicht existieren einige Dateien, oder Sie haben keine Schreibrechte"
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/An_twort"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Antwort an alle"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Ant_wort an Ab_sender"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr "Sie sind nicht verbunden. Wählen sie das Bild zum Verbinden."
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "Sie sind verbunden. Wählen sie das Bild, um die Verbindung zu beenden."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Kommandozeilenoptionen"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Aufruf: sylpheed [OPTION]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3679,7 +3680,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3913,7 +3914,7 @@ msgstr "Account%d"
 msgid "Preferences for new account"
 msgstr "Einstellungen eines neuen Accounts"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Accounteinstellungen"
 
@@ -3926,7 +3927,7 @@ msgid "Receive"
 msgstr "Empfangen"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Senden"
 
@@ -4141,7 +4142,7 @@ msgstr "Beglaubige mit POP3 vor dem Senden"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Unterschrift"
 
@@ -4601,7 +4602,7 @@ msgstr "Übernehme Empfänger bei Nachrichten an mich selbst"
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Editor"
 
@@ -5710,7 +5711,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "[...] oder (...) am Anfang des Betreffes der Antwort löschen"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
@@ -5925,80 +5926,90 @@ msgstr "Drucken"
 msgid "Print message"
 msgstr "Sende Nachricht"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Schritt"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Server zum Empfangen"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Ausführen"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Markierten Prozess ausführen"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Einstellungen"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Sende Nachricht"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Später senden"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "In Queue-Ablage und später senden"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Entwurf"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Speichern in Entwurfablage"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Einfügen"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Datei einfügen"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Anhängen"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Signatur anhängen"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Bearbeiten mit externem Editor"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Zeilenumbruch"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Alle langen Zeilen umbrechen"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Ansicht/_Gehe zu/Anderer Ab_lage..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6253,7 +6264,7 @@ msgstr "Keine digitale Unterschrift gefunden"
 msgid "Good signature from \"%s\""
 msgstr "Gute digitale Unterschrift von \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Gute digitale Unterschrift"
 
@@ -6264,7 +6275,7 @@ msgstr ""
 "Gültige digitale Unterschrift, aber dem Schlüssel für  \"%s\" wird nicht "
 "vertraut."
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Gültige digitale Unterschrift (Schlüssel wird nicht vertraut)"
 
@@ -6307,7 +6318,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "SCHLECHTE digitale Unterschrift von \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "SCHLECHTE digitale Unterschrift"
 
@@ -6753,11 +6764,15 @@ msgstr "Datei %s existiert bereits\n"
 msgid "Creating text view...\n"
 msgstr "Erstelle Textansicht...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Diese Nachricht kann nicht dargestellt werden.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -6765,31 +6780,31 @@ msgstr ""
 "Der Text konnte nicht angezeigt werden, da das Schreiben in eine temporäre "
 "Datei fehlgeschlagen ist. \n"
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "/Speichere dieses Bild _als..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Absender in Adress_buch einfügen"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "Kopiere diese Adresse"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "Öffne _mit Internet-Browser"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Kopiere diese _Verknüpfung"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6802,7 +6817,7 @@ msgstr ""
 "\n"
 "Trotzdem öffnen?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Falsche URL Warnung"
 
diff --git a/po/el.po b/po/el.po
index 52eabf36..24eaa982 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: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+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"
@@ -54,166 +54,166 @@ msgstr "Μετακίνηση μηνυμάτων στο %s"
 msgid "Moving messages %s to %s ..."
 msgstr "Μετακίνηση μηνυμάτων %s στο %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Αντιγραφή μηνυμάτων %s στο %s ..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Διαγραφή μηνυμάτων %s"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "Αποτυχία ορίσματος του PAM_TTY=%s"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "δεν μπορώ να τα απαλείψω\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Διαγραφή όλων των μηνυμάτων στο %s"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "Αποτυχία ορίσματος του PAM_TTY=%s"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "δεν είναι δυνατό το κλείσιμο του φακέλου\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "Ο ριζικός φάκελος %s δεν υπάρχει.\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "προέκυψε σφάλμα κατά τη λήψη της λίστας.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Δεν είναι δυνατή η δημιουργία του '%s'\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Δεν είναι δυνατή η δημιουργία του '%s' μέσα στο INBOX\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 "δεν είναι δυνατή η δημιουργία γραμματοκιβωτίου: η εντολή LIST απέτυχε\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "δεν είναι δυνατή η δημιουργία γραμματοκιβωτίου\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Δεν είναι δυνατή η μετονομασία του γραμματοκιβωτίου: %s σε %s\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "δεν μπορώ να διαγράψω το mailbox\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "δεν είναι δυνατή η λήψη του φακέλου\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Εμφάνιση Όλων των _Κεφαλίδων"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "δημιουργήθηκε σφάλμα κατά τη λήψη του φακέλου.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "δεν είναι δυνατή η ανάλυση του φακέλου: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Δεν είναι δυνατή η σύνδεση στον διακομιστή IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Δεν είναι δυνατή η σύνδεση στον διακομιστή IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 #, fuzzy
 msgid "can't get namespace\n"
 msgstr "Αδυναμία λήψης όνοματος χρήστη"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "σφάλμα στην εντολή imap: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "Η πιστοποίηση στον IMAP4 απέτυχε.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "Η είσοδος στον IMAP4 απέτυχε.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "δεν είναι δυνατή η προσάρτηση του %s στο %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(αποστολή αρχείου...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "Δεν είναι δυνατή η προσθήκη μηνύματος στον φάκελο `%s': %s"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "δεν είναι δυνατή η αντιγραφή του %s στο %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Error while spawning the mbadblocks command: %s."
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 #, fuzzy
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Error while spawning the mbadblocks command: %s."
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "Error while spawning the mbadblocks command: %s."
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "Δεν είναι δυνατή η μετατροπή του UTF-7 σε %s από το iconv\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "Δεν είναι δυνατή η μετατροπή του %s σε UTF-7 από το iconv\n"
@@ -303,20 +303,20 @@ msgstr "Εξαγωγή μηνυμάτων από το %s στο %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "δεν μπορώ να αντιγράψω το μήνυμα %s στο %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Δεν είναι δυνατή η σημείωση του αρχείου.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "ο φάκελος προορισμού είναι ο ίδιος με τον αρχικό.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Αντιγραφή μηνύματος %s%c%d στο %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -325,7 +325,7 @@ msgstr ""
 "Το αρχείο '%s' υπάρχει ήδη.\n"
 "Δεν είναι δυνατή η δημιουργία του φακέλου."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -605,13 +605,13 @@ msgstr "  Θέμα: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Εκδότης: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 #, fuzzy
 msgid "can't change file mode\n"
 msgstr "Η αλλαγή της κατάστασης του `%s' απέτυχε"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "η εγγραφή στο %s απέτυχε.\n"
@@ -697,7 +697,7 @@ msgstr ""
 "όλων'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -833,7 +833,7 @@ msgstr "Παράμετρος ενέργειας χρήστη"
 msgid "Add Address to Book"
 msgstr "Προσθήκη διεύθυνσης στο ευρετήριο"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Διεύθυνση"
 
@@ -846,7 +846,7 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή φακέλου από το Ευρετήριο διευθύνσεων"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Αρχείο"
@@ -868,9 +868,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Αρχείο/---"
@@ -892,11 +892,11 @@ msgid "/_File/_Close"
 msgstr "/_Αρχείο/_Κλείσιμο"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Επεξεργασία"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Επεξεργασία/_Αντιγραφή"
@@ -933,7 +933,7 @@ msgstr "/_Διεύθυνση/_Επεξεργασία"
 msgid "/_Address/_Delete"
 msgstr "/_Διεύθυνση/_Διαγραφή"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Εργαλεία"
@@ -942,12 +942,12 @@ msgstr "/_Εργαλεία"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Βοήθεια"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Βοήθεια/_Σχετικά"
@@ -992,7 +992,7 @@ msgstr "/Ε_πικόλληση"
 msgid "E-Mail address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
@@ -1056,7 +1056,7 @@ msgstr ""
 "Θέλετε να διαγράψετε το '%s' ; Αν διαγράψετε μόνο το φάκελο, οι διευθύνσεις "
 "που περιέχει θα μετακινηθούν στον γονικό φάκελο."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Διαγραφή φακέλου"
 
@@ -1223,15 +1223,15 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Σημείωση"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -1332,7 +1332,7 @@ msgstr "/_Επεξεργασία/Α_ναίρεση"
 msgid "/_Edit/_Redo"
 msgstr "/_Επεξεργασία/Επανά_ληψη"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Επεξεργασία/---"
@@ -1345,7 +1345,7 @@ msgstr "/_Επεξεργασία/Απο_κοπή"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Επεξεργασία/Eπικόλληση ως πα_ράθεση"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Επεξεργασία/Επιλ_ογή όλων"
 
@@ -1361,7 +1361,7 @@ msgstr "/_Επεξεργασία/Αναδίπλωση μακρών _γραμμώ
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Επεξεργασία/Αυτό_ματη αναδίπλωση"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Προβολή"
@@ -1383,9 +1383,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Προβολή/_Απάντηση σε"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Προβολή/---"
 
@@ -1405,7 +1405,7 @@ msgstr "/_Προβολή/Σ_υνημμένου"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Προβολή/Προσαρμογή ε_ργαλειοθήκης..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων"
 
@@ -1416,112 +1416,112 @@ msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/_Αυτ�
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Δυτικής Ευρώπης (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Δυτικής Ευρώπης (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κεντρικής Ευρώπης (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/_Βαλτικής (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Βαλτικής (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Βαλτικής (Windows-1257)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ελληνικά (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Αραβική (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Αραβική (Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Εβραϊκή (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Εβραϊκή (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Τούρκικη (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (KOI8-U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κυριλλική (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ιαπωνέζικη (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Απλοποιημένη Κινέζικη (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κορεάτικη (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ταϊλανδέζικη (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ταϊλανδέζικη (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Εργαλεία/_Ευρετήριο διευθύνσεων"
 
@@ -1529,13 +1529,13 @@ msgstr "/_Εργαλεία/_Ευρετήριο διευθύνσεων"
 msgid "/_Tools/_Template"
 msgstr "/_Εργαλεία/_Πρότυπο"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Εργαλεία/Ε_νέργειες"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Εργαλεία/---"
@@ -1569,70 +1569,70 @@ msgstr "%s: το αρχείο δεν υπάρχει\n"
 msgid "Can't get text part\n"
 msgstr "Δεν είναι δυνατή η λήψη του κειμένου\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Σφάλμα μορφοποίησης σημείωσης παράθεσης."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Σφάλμα στην απάντηση/προώθηση του μηνύματος."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Δεν είναι δυνατή η λήψη του μεγέθους του %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Το αρχείο %s είναι κενό."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Δεν είναι δυνατή η ανάγνωση του %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Μήνυμα: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Δεν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Χωρίς θέμα)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Σύνθεση μηνύματος%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Δεν έχει οριστεί παραλήπτης."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Κενό θέμα"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Το θέμα είναι κενό. Να γίνει η αποστολή;"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "δεν είναι δυνατή η λήψη λίστας παραληπτών."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1640,23 +1640,23 @@ msgstr ""
 "Ο λογαριασμός για αποστολή μηνύματος δεν έχει οριστεί.\n"
 "Παρακαλώ επιλέξτε ένα λογαριασμό πριν στείλετε."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Δημιουργήθηκε σφάλμα κατά την αποστολή του μηνύματος στο %s ."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Δεν είναι δυνατή η αποθήκεύσή του μηνύματος στα εξερχόμενα."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Δεν ήταν δυνατή η εύρεση του κλειδιού που σχετίζεται με το επιλεγμένο "
 "αναγνωριστικό `%s'."
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1667,11 +1667,11 @@ msgstr ""
 "του μηνύματος στο προσδιορισμένο σύνολο %s.\n"
 "Να αποσταλεί ως %s;"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Σφάλμα μετατροπής κώδικα"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1684,15 +1684,15 @@ msgstr ""
 "\n"
 "Να γίνει αποστολή;"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Όριο μήκους γραμμής"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr "Κρυπτογράφηση στους κρυφούς παραλήπτες"
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1706,86 +1706,86 @@ msgstr ""
 "\n"
 "Να γίνει η αποστολή;"
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "Δεν είναι δυνατή η διαγραφή του παλιού μηνύματος\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "προσθήκη στην ουρά...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "Δεν είναι δυνατή η εύρεση του πηγαίου φακέλου."
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr ""
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Δημιουργία παραθύρου σύνθεσης...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "Υπογραφή PGP"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "Κρυπτογράφηση PGP"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "τύπος MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει ή είναι άδειο."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διαδρομή"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, fuzzy, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr ""
 "Η εντολή εκτύπωσης είναι άκυρη:\n"
 "'%s'"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1795,49 +1795,49 @@ msgstr ""
 "Να επιβάλω τερματισμό της διεργασίας;\n"
 "process group id: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr "Προσαρμο_γή εργαλειοθήκης..."
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Δεν είναι δυνατή η τοποθέτηση του μηνύματος στην ουρά."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Επιλογή αρχείων"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Αποθήκευση μηνύματος"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Αυτό το μήνυμα έχει τροποποιηθεί. Θέλετε να το αποθηκεύσετε στα πρόχειρα;"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "Κλείσιμο _χωρίς αποθήκευση"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε να εφαρμόσετε το πρότυπο '%s' ;"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Εφαρμογή προτύπου"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "_Εισαγωγή"
 
@@ -1994,12 +1994,12 @@ msgstr "Επεξεργασία φακέλου"
 msgid "Input the new name of folder:"
 msgstr "Εισάγετε το νέο όνομα του φακέλου:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Νέος φάκελος"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Εισάγετε το όνομα του νέου φακέλου:"
 
@@ -2168,42 +2168,42 @@ msgstr "Επιλογή καταλόγου"
 msgid "Select folder"
 msgstr "Επιλογή φακέλου"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Σταλμένα"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Ουρά"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Διαγραμμένα"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "ΝέοςΦάκελος"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Το `%c' δεν μπορεί να συμπεριλαμβάνεται σε όνομα φακέλου."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Ο φάκελος `%s' υπάρχει ήδη."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Δεν είναι δυνατή η δημιουργία του φακέλου `%s'."
@@ -2292,56 +2292,56 @@ msgstr "Ορισμός πληροφοριών φακέλου...\n"
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες φακέλων..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση φακέλων %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση φακέλου %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Επαναδημιουργία διάταξης φακέλων"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Θα ξαναδημιουργηθεί η διάταξη των φακέλων. Συνέχεια;"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Επαναδημιουργία διάταξης φακέλων..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Η επαναδημιουργία της λίστας φακέλων απέτυχε."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Ανεπιθύμητη αλληλογραφία"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Επιλέχθηκε ο φάκελος %s\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Λήψη μηνυμάτων στο %s ..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Συνέβη σφάλμα κατά τη λήψη μηνυμάτων στο '%s'."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2351,26 +2351,26 @@ msgstr ""
 "(αν θέλετε να δημιουργήσετε ένα φάκελο για να βάλετε υποφακέλους\n"
 " προσθέστε ένα '/' στο τέλος του ονόματος)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Επιλέξτε ένα νέο όνομα για το `%s':"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Μετονομασία φακέλου"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Δεν είναι δυνατή η μετονομασία του φακέλου '%s'."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Δεν είναι δυνατή η μετακίνηση του φακέλου '%s'."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2379,11 +2379,11 @@ msgstr ""
 "Σίγουρα να διαγραφεί ο φάκελος αναζήτησης '%s' ;\n"
 "(Τα μηνύματα δε διαγράφονται από τον δίσκο)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Διαγραφή φακέλου αναζήτησης"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2396,20 +2396,20 @@ msgstr ""
 "\n"
 "Θέλετε πράγματι να τα διαγράψετε;"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Δεν είναι δυνατή η διαγραφή του φακέλου '%s'."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Άδειασμα απορριμμάτων"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Διαγραφή όλων των μηνυμάτων στο φάκελο απορριμμάτων;"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2418,34 +2418,34 @@ msgstr ""
 "Σίγουρα να διαγραφεί το γραμματοκιβώτιο `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Αφαίρεση γραμματοκιβωτίου"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Να διαγραφεί ο λογαριασμός IMAP4 `%s';"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Διαγραφή λογαριασμού IMAP4"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Να διαγραφεί η ομάδα νέων `%s';"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Διαγραφή ομάδας νέων"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Να διαγραφεί ο λογαριασμός νέων `%s';"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Διαγραφή λογαριασμού νέων"
 
@@ -2593,143 +2593,143 @@ msgstr "Τέλος"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d νέα μηνύματά"
 
-#: src/inc.c:478
+#: src/inc.c:481
 msgid "Authenticating with POP3"
 msgstr "Πιστοποίηση με POP3"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Λήψη νέων μηνυμάτων"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Σε αναμονή"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Λήψη"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Ολοκληρώθηκε (%d μηνύματα (%s) παρελήφθησαν)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Ολοκληρώθηκε (δεν υπάρχουν νέα μηνύματα)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Η εντολή Auth απέτυχε"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Κλειδωμένο"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Όριο χρόνου"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Ολοκληρώθηκε (%d νέα μηνύματα)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Ολοκληρώθηκε (δεν υπάρχουν νέα μηνύματα)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Συνέβησαν σφάλματα κατά την αποστολή των μηνυμάτων στην ουρά."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "λήψη νέων μηνυμάτων λογαριασμού %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Πιστοποίηση με POP3"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Λήψη νέων μηνυμάτων"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Σύνδεση με το διακομιστή POP3: %s..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον POP3 server: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Πιστοποίηση..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Λήψη μηνυμάτων από %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Λήψη αριθμού νέων μηνυμάτων (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Λήψη μεγέθους μηνυμάτων (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Διαγραφή μηνύματος %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Κλείνω τη σύνδεση"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Λαμβάνεται το μήνυμα (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Παραλαβή (%d μηνύματα (%s) παρελήφθησαν)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Η σύνδεση απέτυχε."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το μήνυμα."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2738,28 +2738,28 @@ msgstr ""
 "Δημιουργήθηκε σφάλμα κατά την επεξεργασία μηνυμάτων:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Δεν υπάρχει άλλος χώρος στο δίσκο."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Δεν είναι δυνατή η εγγραφή του αρχείου."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Σφάλμα σύνδεσης."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Η σύνδεση έκλεισε από τον απομακρυσμένο υπολογιστή."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Το γραμματοκιβώτιο είναι κλειδωμένο."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2768,11 +2768,11 @@ msgstr ""
 "Το γραμματοκιβώτιο είναι κλειδωμένο:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Η πιστοποίηση απέτυχε."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2781,15 +2781,15 @@ msgstr ""
 "Η πιστοποίηση απέτυχε:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Λήξη χρόνου σύνδεσης."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Η ενσωμάτωση ακυρώθηκε\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Λήψη μηνυμάτων από %s στο %s ...\n"
@@ -2922,7 +2922,7 @@ msgstr "Μηνύματα στην ουρά"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Μερικά μηνύματα δεν έχουν σταλεί και είναι στην ουρά. Να κλείσω;"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2931,15 +2931,15 @@ msgstr ""
 "Η υποστήριξη OpenPGP απενεργοποιήθηκε."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "Τρέχει ήδη ένα Sylpheed.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Μεταφορά ρυθμίσεων"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2947,658 +2947,659 @@ msgstr ""
 "Βρέθηκε η προηγούμενη έκδοση των ρυθμίσεων.\n"
 "Θέλετε να τις μεταφέρετε;"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Αρχείο/_Φάκελος"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Αρχείο/_Φάκελος/Δημιουργία _νέου φακέλου..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Αρχείο/_Φάκελος/Μετ_ονομασία φακέλου..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Αρχείο/_Φάκελος/_Μετακίνηση φακέλου..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Αρχείο/_Φάκελος/_Διαγραφή φακέλου..."
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Αρχείο/_Γραμματοκιβώτιο"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Αρχείο/_Γραμματοκιβώτιο/Προσθήκη _γραμματοκιβωτίου"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Αρχείο/_Γραμματοκιβώτιο/_Διαγραφή γραμματοκιβωτίου"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_Αρχείο/_Γραμματοκιβώτιο/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Αρχείο/_Γραμματοκιβώτιο/Έλεγ_χος για νέα μηνύματα"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/_Αρχείο/_Γραμματοκιβώτιο/Έλεγχος για _νέα μηνύματα σε όλους τους φακέλους"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Αρχείο/_Γραμματοκιβώτιο/Ανακατασκε_υή διάταξης φακέλων"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Αρχείο/Ε_ισαγωγή αρχείου mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Αρχείο/_Εξαγωγή σε αρχείο mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Αρχείο/Άδειασμα όλων _των φακέλων Απορριμμάτων"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Αρχείο/Αποθήκευση _ως..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 msgid "/_File/Page set_up..."
 msgstr "/_Αρχείο/_Διαμόρφωση σελίδας..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Αρχείο/Εκτύ_πωση..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Αρχείο/Εργασία χωρίς σύνδεση"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Αρχείο/Έ_ξοδος"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Επεξεργασία/Επιλογή _νήματος"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Επεξεργασία/Εύ_ρεση στο τρέχον μήνυμα..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Επεξεργασία/Αναζήτη_ση..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Προβολή/Εμφάνιση ή α_πόκρυψη"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Προβολή/Εμφάνιση ή α_πόκρυψη/Στήλη _φακέλων"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Προβολή/Εμφάνιση ή α_πόκρυψη/Προβολή _μηνύματος"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Προβολή/Εμφάνιση ή α_πόκρυψη/_Εργαλείοθήκη"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Προβολή/Εμφάνιση ή α_πόκρυψη/_Εργαλείοθήκη/Εικονίδια κ_αι κείμενο"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr ""
 "/Προβολή/Εμφάνιση ή α_πόκρυψη/_Εργαλείοθήκη/Κείμενο στα _δεξιά του εικονιδίου"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Προβολή/Εμφάνιση ή α_πόκρυψη/_Εργαλείοθήκη/_Εικονίδια"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Προβολή/Εμφάνιση ή α_πόκρυψη/_Εργαλείοθήκη/_Κείμενο"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Προβολή/Εμφάνιση ή α_πόκρυψη/_Εργαλείοθήκη/_Απόκρυψη"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Προβολή/Εμφάνιση ή α_πόκρυψη/Γραμμή _αναζήτησης"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Προβολή/Εμφάνιση ή α_πόκρυψη/Γραμμή _κατάστασης"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Προβολή/Π_ροσαρμογή εργαλειοθήκης..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Προβολή/Αποσύνδεση στήλης _φακέλων"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/_Προβολή/Αποσύνδεση προβολής _μηνύματος"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Προβολή/_Ταξινόμηση"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά _νούμερο"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά _μέγεθος"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά _χρονολογία"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά χρονολογία νή_ματος"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά _αποστολέα"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά πα_ραλήπτη"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά _θέμα"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά χρ_ωματική ταμπέλα"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά _σημείωση"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Προβολή/_Ταξινόμηση/μη αναγν_ωσμένα"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Προβολή/_Ταξινόμηση/κατά συν_ημμένο"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Προβολή/_Ταξινόμηση/Ατα_ξινόμητα"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Προβολή/_Ταξινόμηση/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Προβολή/_Ταξινόμηση/Αύξουσα"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Προβολή/_Ταξινόμηση/Φθίνουσα"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Προβολή/_Ταξινόμηση/_Ομαδοποίηση κατά θέμα"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Προβολή/Κατάταξη σε _νήματα"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Προβολή/Ανάπτυ_ξη όλων των νημάτων"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Προβολή/Σύμπτ_υξη όλων των νημάτων"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "Ορισμός εικονιδίου για προβολή"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Προβολή/Μετά_βαση"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Προβολή/Μετά_βαση/_Προηγούμενο μήνυμα"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Προβολή/Μετά_βαση/_Επόμενο μήνυμα"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Προβολή/Μετά_βαση/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Προβολή/Μετά_βαση/Π_ροηγούμενο μη αναγνωσμένο μήνυμα"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Προβολή/Μετά_βαση/Ε_πόμενο μη αναγνωσμένο μήνυμα"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Προβολή/Μετά_βαση/Προηγούμενο _νέο μήνυμα"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Προβολή/Μετά_βαση/Επόμενο νέο μήνυμα"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Προβολή/Μετά_βαση/Προηγούμενο _σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Προβολή/Μετά_βαση/Επόμενο σ_ημειωμένο μήνυμα"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 #, fuzzy
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Απεικόνιση/Μετάβαση/Προηγούμενο σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 #, fuzzy
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Προβολή/Μετά_βαση/Επόμενο σημειωμένο μήνυμα"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Προβολή/Μετά_βαση/Ά_λλο φάκελο..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/_Αυτόματη αναγνώριση"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Δυτικής Ευρώπης (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ιαπωνέζικη (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ιαπωνέζικη (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Ιαπωνέζικη (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Παραδοσιακή Κινέζικη (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κινέζικη (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κορεάτικη (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Προβολή/Άνοι_γμα σε νέο παράθυρο"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Προβολή/Πηγαίος _κώδικας μηνύματος"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/Προ_βολή/Ό_λων των κεφαλίδων"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Προβολή/Ανανέ_ωση"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Μήνυμα"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/_Μήνυμα/_Λήψη"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Μήνυμα/_Λήψη/Από τον _τρέχοντα λογαριασμό"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Μήνυμα/_Λήψη/Από _όλους τους λογαριασμούς"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Μήνυμα/_Λήψη/_Ακύρωση λήψης"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Μήνυμα/_Λήψη/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Μήνυμα/Αποστολή μηνυμάτων στην _ουρά"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Μήνυμα/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Μήνυμα/Σύνθεση _νέου μηνύματος"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Μήνυμα/Α_πάντηση"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Μήνυμα/Απάντηση _σε"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Μήνυμα/Απάντηση _σε/όλ_ους"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Μήνυμα/Απάντηση _σε/_αποστολέα"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Μήνυμα/Απάντηση _σε/_λίστα αλληλογραφίας"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Μήνυμα/_Προώθηση"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Μήνυμα/Π_ροώθηση ως συνημμένο"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Μήνυμα/Αναμε_τάδοση"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Μήνυμα/_Μετακίνηση..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Μήνυμα/_Αντιγραφή..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Μήνυμα/Σ_ημείωση"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Μήνυμα/Σ_ημείωση/Σ_ημείωση"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Μήνυμα/Σ_ημείωση/_Αναίρεση σημείωσης"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Μήνυμα/Σ_ημείωση/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Μήνυμα/Σ_ημείωση/Ως _μη αναγνωσμένο"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Μήνυμα/Σ_ημείωση/Ως _αναγνωσμένο"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Μήνυμα/Σ_ημείωση/_Νήμα ως αναγνωσμένο"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Μήνυμα/Σ_ημείωση/Ό_λων ως αναγνωσμένα"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Μήνυμα/_Διαγραφή"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Μήνυμα/Α_νεπιθύμητη αλληλογραφία"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Μήνυμα/Επιθ_υμητή αλληλογραφία"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Μήνυμα/Επαν-_επεξεργασία"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Εργαλεία/Προσθήκη αποστολέα στο ευρετήριο _διευθύνσεων"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Εργαλεία/_Φιλτράρισμα όλων των μηνυμάτων στο φάκελο"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Εργαλεία/Φιλτράρισμα ε_πιλεγμένων μηνυμάτων"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου/_Αυτόματα"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου/από τον απο_στολέα"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου/από τους _παραλήπτες"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Εργαλεία/Δη_μιουργία Φίλτρου/από το _θέμα"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Εργαλεία/Φιλτράρισμα α_νεπιθύμητης αλληλογραφίας στο φάκελο"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr ""
 "/_Εργαλεία/Φιλτράρισμα αν_επιθύμητης αλληλογραφίας στα επιλεγμένα μηνύμάτα"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Εργαλεία/Διαγραφή δ_ιπλών μηνυμάτων"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Εκτέλεσης σημειωμένης διεργασίας"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Εργαλεία/Πα_ράθυρο καταγραφής"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Ρυθμίσεις"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Ρυθμίσεις/_Κοινές προτιμήσεις..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Ρυθμίσεις/Ρυθμίσεις _φίλτρων..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Ρυθμίσεις/Πρό_τυπα..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Ρυθμίσεις/Ενέργε_ιες..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Ρυθμίσεις/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Ρυθμίσεις/_Προτιμήσεις ενεργού λογαριασμού..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Ρυθμίσεις/Δημιουργία _νέου λογαριασμού..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Ρυθμίσεις/_Επεξεργασία λογαριασμών..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Ρυθμίσεις/Α_λλαγή ενεργού λογαριασμού"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Βοήθεια/_Τεκμηρίωση"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Βοήθεια/_Τεκμηρίωση/_Αγγλική"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Βοήθεια/_Τεκμηρίωση/_Ιαπωνική"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/_Βοήθεια/Συ_χνές ερωτήσεις"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/Βοήθεια/Συ_χνές ερωτήσεις/_Αγγλικά"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Βοήθεια/Συ_χνές ερωτήσεις/_Γερμανικό"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Βοήθεια/Συ_χνές ερωτήσεις/_Ισπανικά"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/Βοήθεια/Συ_χνές ερωτήσεις/_Γαλλικά"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Βοήθεια/Συ_χνές ερωτήσεις/_Ιταλικό"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/_Βοήθεια/_Επιλογές γραμμής εντολών"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Βοήθεια/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Δημιουργία κύριου παραθύρου...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "έγινε.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Χωρίς τίτλο"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "κανένα"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Χωρίς σύνδεση"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Είστε αποσυνδεδεμένος. Θέλετε να συνδεθείτε;"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Άδειασμα απορριμμάτων"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Διαγραφή όλων των μηνυμάτων σε όλους τους φακέλους απορριμμάτων;"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Προσθήκη γραμματοκιβωτίου"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3608,16 +3609,16 @@ msgstr ""
 "Αν οριστεί το υπάρχον γραμματοκιβώτιο, θα\n"
 "σαρωθεί αυτόματα."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Το γραμματοκιβώτιο '%s' υπάρχει ήδη."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Γραμματοκιβώτιο"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3626,67 +3627,67 @@ msgstr ""
 "Η δημιουργία του γραμματοκιβωτίου απέτυχε.\n"
 "Ίσως κάποια αρχεία να υπάρχουν ήδη, ή δεν έχετε δικαίωμα να γράψετε εκεί."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Προβολή φακέλων"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Προβολή μηνύματος"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Απάντηση"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "Απάντηση σε Ό_λους"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Απάντηση στον απο_στολέα"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση στη _λίστα ηλεκτρονικού ταχυδρομείου"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Πρ_οώθηση"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως συ_νημμένο"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Ε_κτροπή"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr "Είστε συνδεδεμένος. Κάντε κλικ στο εικονίδιο για να αποσυνδεθείτε."
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "Είστε συνδεδεμένος. Κάντε κλικ στο εικονίδιο για να αποσυνδεθείτε."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Έξοδος από το πρόγραμμα;"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Επιλογές γραμμής εντολών"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Χρήση: sylpheed [ΕΠΙΛΟΓΗ]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3714,7 +3715,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3944,7 +3945,7 @@ msgstr "Λογαριασμός%d"
 msgid "Preferences for new account"
 msgstr "Επιλογές για το νέο λογαριασμό"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Προτιμήσεις λογαριασμού"
 
@@ -3957,7 +3958,7 @@ msgid "Receive"
 msgstr "Λήψη"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Αποστολή"
 
@@ -4171,7 +4172,7 @@ msgstr "Πιστοποίηση με POP3 πριν την αποστολή"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Yπογραφή"
 
@@ -4628,7 +4629,7 @@ msgstr "Διαδοχή παραληπτών στην απάντηση των δ�
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Επεξεργαστής κειμένου"
 
@@ -5733,7 +5734,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Διαγραφή του [...] ή (...) στην αρχή του θέματος κατά την απάντηση"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Λογαριασμός"
 
@@ -5939,79 +5940,89 @@ msgstr "Εκτύπωση"
 msgid "Print message"
 msgstr "Εκτύπωση μηνύματος"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Κατά βήματα"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Εξυπηρέτης για λήψη"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Εκτέλεσης σημειωμένης διεργασίας"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Προτιμ"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Κοινές προτιμήσεις"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Αποστολή αργότερα"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Τοποθέτηση στον κατάλογο ουράς και αποστολή αργότερα"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Πρόχειρα"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Αποθήκευση στον κατάλογο προχείρων"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Εισαγωγή"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Εισαγωγή αρχείου"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Επισύναψη"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Επισύναψη αρχείου"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Προσθήκη υπογραφής"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Επεξεργασία με εξωτερικό πρόγραμμα"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Αναδίπλωση"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Αναδίπλωση όλων των μακρυών γραμμών"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 msgid "Customize toolbar"
 msgstr "Προσαρμογή εργαλειοθήκης"
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
 "the order by using the Up / Down button."
@@ -6263,7 +6274,7 @@ msgstr "Δεν βρέθηκε υπογραφή"
 msgid "Good signature from \"%s\""
 msgstr "Έγκυρη υπογραφή από τον/την \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Έγκυρη υπογραφή"
 
@@ -6272,7 +6283,7 @@ msgstr "Έγκυρη υπογραφή"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Έγκυρη υπογραφή αλλά το κλειδί για το \"%s\" δεν είναι έμπιστο"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Έγκυρη υπογραφή (όχι έμπιστη)"
 
@@ -6308,7 +6319,7 @@ msgstr "Η υπογραφή είναι έγκυρη αλλά το κλειδί �
 msgid "BAD signature from \"%s\""
 msgstr "Εσφαλμένη υπογραφή από τον/την \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "Εσφαλμένη υπογραφή"
 
@@ -6762,41 +6773,45 @@ msgstr "Το αρχείο \"%s\" υπάρχει ήδη\n"
 msgid "Creating text view...\n"
 msgstr "Δημιουργία προβολής κειμένου...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Δεν είναι δυνατή η προβολή αυτού του μηνύματος.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "Α_ποθήκευση εικόνας ως..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Σύνθεση _νέου μηνύματος"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Προσθήκη στο _ευρετήριο διευθύνσεων..."
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "Αντιγραφή _διεύθυνσης"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "_Άνοιγμα με τον περιηγητή ιστοσελίδων"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Αντιγραφή _συνδέσμου"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6809,7 +6824,7 @@ msgstr ""
 "\n"
 "Θέλετε σίγουρα να την ανοίξετε;"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Προειδοποίηση για μη έγκυρο URL"
 
diff --git a/po/es.po b/po/es.po
index 416d69de..37e55a3c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2006-12-02 13:12+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -51,161 +51,161 @@ msgstr "Agregando mensajes a %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "Moviendo mensajes %s a %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensajes %s a %s ..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Borrando mensajes %s"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "no puedo establecer los flags borrados: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "no puedo vaciar\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Borrando todos los mensajes en %s"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "no puedo establecer los flags borrados: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "no se puede cerrar la carpeta\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "la carpeta raíz %s no existe\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "hubo un error obteniendo LIST.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "No puedo crear «%s»\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "No puedo crear «%s» bajo Entrada\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, 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:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "no puedo borrar el buzón\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "no se puede obtener la estructura del mensaje\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Obteniendo las cabeceras de mensaje (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "error obteniendo la estructura del mensaje.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "No se puede interpretar la estructura del mensaje: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, 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:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "no se puede obtener el espacio de nombres\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "error en el mandato imap: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "La autentificación IMAP falló.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "no puedo añadir %s a %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(enviando fichero...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "no se puede añadir el mensaje a %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "no puedo copiar %s a %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "error en el mandato imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "error en el mandato imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "error en el mandato imap: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no puede convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no puede convertir %s a UTF-7\n"
@@ -297,20 +297,20 @@ msgstr "Exportando mensajes de %s a %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "no se puede copiar mensaje %s a %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "No se puede abrir el fichero de marcas.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "las carpetas de origen y destino son idénticas.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiando mensaje %s%c%d a %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -319,7 +319,7 @@ msgstr ""
 "El fichero «%s» ya existe.\n"
 "No puedo crear la carpeta."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -594,12 +594,12 @@ msgstr "  Asunto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Emisor: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "no se pueden cambiar los permisos de archivo\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "fallo escribiendo en %s.\n"
@@ -683,7 +683,7 @@ msgstr ""
 "en la columna «G» para habilitar la descarga mediante «Recibir todo»."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -818,7 +818,7 @@ msgstr "Parámetro de usuario de la acción"
 msgid "Add Address to Book"
 msgstr "Añadir dirección a la agenda"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Dirección"
 
@@ -831,7 +831,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichero"
@@ -853,9 +853,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Fichero/Nuevo servidor _LDAP"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Fichero/---"
@@ -877,11 +877,11 @@ msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
@@ -918,7 +918,7 @@ msgstr "/_Dirección/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Herramientas"
@@ -927,12 +927,12 @@ msgstr "/_Herramientas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -979,7 +979,7 @@ msgstr "/_Editar/_Pegar"
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
@@ -1044,7 +1044,7 @@ msgstr ""
 "¿Quiere borrar la carpeta Y todas las direcciones en «%s»? \n"
 "Si sólo borra la carpeta las direcciones se moverán a la carpeta padre."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1202,15 +1202,15 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Error"
 
@@ -1310,7 +1310,7 @@ msgstr "/_Editar/_Deshacer"
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
@@ -1323,7 +1323,7 @@ msgstr "/_Editar/Cor_tar"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
@@ -1339,7 +1339,7 @@ msgstr "/_Editar/_Recortar todas las líneas largas"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Ver"
@@ -1361,9 +1361,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ver/_Responder a"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
@@ -1384,7 +1384,7 @@ msgstr "/_Ver/_Adjuntos"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/Codificación de caract_eres"
 
@@ -1395,112 +1395,112 @@ msgstr "/_Ver/Codificación de caract_eres/_Automática"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/Codificación de caract_eres/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 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:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/Codificación de caract_eres/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/Codificación de caract_eres/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/Codificación de caract_eres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ver/Codificación de caract_eres/Báltico (Windows-1257)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/Codificación de caract_eres/Griego (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ver/Codificación de caract_eres/Arábigo (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ver/Codificación de caract_eres/Arábigo (Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/Codificación de caract_eres/Hebreo (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/Codificación de caract_eres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (KOI8-U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/Codificación de caract_eres/Cirílico (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/Codificación de caract_eres/Chino simplificado (GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/Codificación de caract_eres/Tailandés (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
@@ -1508,13 +1508,13 @@ msgstr "/_Herramientas/_Agenda de direcciones"
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/Plan_tillas"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
@@ -1548,70 +1548,70 @@ msgstr "%s: el fichero no existe\n"
 msgid "Can't get text part\n"
 msgstr "No se puede obtener la parte de texto\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Error en el formato de la marca de cita."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Error en el formato de responder/redirijir."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "El fichero %s no existe\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, 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:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "No se puede leer %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componer%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Asunto vacío"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "no se puede obtener la lista de destinatarios."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1619,23 +1619,23 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta de correo antes de enviar."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hubo un error enviando el mensaje a %s ."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "No se puede guardar el mensaje en Salida."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1646,11 +1646,11 @@ msgstr ""
 "\n"
 "¿Enviarlo como %s de todas formas?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Error en la conversión de códigos"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1663,15 +1663,15 @@ msgstr ""
 "\n"
 "¿Enviarlo de todas formas?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Límite de longitud de línea"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1680,83 +1680,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "no se puede eliminar el mensaje antiguo\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "poniendo en la cola...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "no puedo encontrar la carpeta de cola\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "El mensaje no se puede poner en la cola\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Creando ventana de composición...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, 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:5724
+#: src/compose.c:5732
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1765,48 +1765,48 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 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:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -1963,12 +1963,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2137,42 +2137,42 @@ msgstr "Seleccionar directorio"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' no puede estar en el nombre de la carpeta."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta «%s»."
@@ -2259,56 +2259,56 @@ msgstr "Estableciendo la información de la carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Estableciendo la información de la carpeta..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Se reconstruirá el árbol de carpetas. ¿Continuar?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo el árbol de carpetas..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Fallo al reconstruir el árbol de carpetas."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Basura"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descargando mensajes en %s ..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hubo un error descargando los mensajes en «%s»."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2318,26 +2318,26 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " añada «/» al final del nombre)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para «%s»:"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "No se puede renombrar la carpeta «%s»."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "No se puede mover la carpeta «%s»."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2346,11 +2346,11 @@ msgstr ""
 "¿Eliminar la carpeta de búsqueda «%s» ?\n"
 "(Los mensajes no se borrarán)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Borrar carpeta de búsqueda"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2363,20 +2363,20 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarla?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede borrar la carpeta «%s»."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2385,34 +2385,34 @@ msgstr ""
 "¿Realmente desea eliminar el buzón «%s» ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 «%s»?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias «%s»?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias «%s»?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
@@ -2558,143 +2558,143 @@ msgstr "Finalizar"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d mensajes nuevos"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autentificando"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Obteniendo nuevos mensajes"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hecho (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Hecho (no hay mensajes nuevos)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Authorización fallida"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Tiempo límite"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaje(s) nuevo(s))"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Hubo algún error obteniendo el correo."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obteniendo nuevos mensajes de la cuenta %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autentificando"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando al servidor POP3: %s..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servidor POP3: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Autentificando..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obteniendo mensajes desde %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de nuevos mensajes (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaje %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Saliendo"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Obteniendo (%d mensaje(s) (%s) recibido(s))"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Conexión fallida."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Hubo un error mientras se procesaba el correo."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2703,28 +2703,28 @@ msgstr ""
 "Hubo un error procesando el correo:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por la máquina remota."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "El buzón esta bloqueado."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2733,11 +2733,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "La autentificación falló."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2746,15 +2746,15 @@ msgstr ""
 "La autentificación falló:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Se agotó el tiempo de espera de la sesión."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obteniendo nuevos mensajes desde %s en %s...\n"
@@ -2885,7 +2885,7 @@ msgstr "Mensajes en cola"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2894,15 +2894,15 @@ msgstr ""
 "Soporte para OpenPGP deshabilitado."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "ya hay otro Sylpheed en ejecución.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2910,656 +2910,657 @@ msgstr ""
 "Se encontró una versión anterior de la configuración.\n"
 "¿Desea migrarla?"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Fichero/_Carpeta"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fichero/_Carpeta_/Crear _nueva carpeta..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fichero/_Carpeta_/_Renombrar carpeta..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fichero/_Carpeta_/_Mover carpeta..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fichero/_Carpeta_/_Borrar carpeta"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Fichero/_Buzón"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fichero/_Buzón/_Añadir buzón..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fichero/_Buzón/_Eliminar buzón"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fichero/_Buzón/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fichero/_Buzón/_Comprobar si hay mensajes nuevos"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fichero/_Buzón/_Comprobar mensajes nuevos en todas las carpetas"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fichero/_Buzón/R_econstruir árbol de carpetas"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fichero/I_mportar fichero mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fichero/_Exportar a un fichero mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Fichero/_Vaciar todas las papeleras"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Fichero/_Guardar como..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Fichero/_Guardar como..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Fichero/_Imprimir..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Fichero/_Trabajar sin conexión"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Fichero/Sali_r"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _hilo"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar en el mensaje actual..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edición/_Buscar en los mensajes..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Ver/Mostrar u o_cultar"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ver/Mostrar u o_cultar/_Árbol de carpetas"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ver/Mostrar u o_cultar/Vista de _mensajes"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/Iconos _y texto"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Iconos"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Iconos"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Texto"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Ocultar"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Ver/Mostrar u o_cultar/Barra de bú_squeda"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar u o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar árb_ol de carpetas"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensajes"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordenar"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordenar/Por _número"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordenar/Por _tamaño"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordenar/Por _fecha"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Ver/_Ordenar/Por _fecha del hilo"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordenar/Por _remitente"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordenar/Por _destinatario"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordenar/Por a_sunto"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordenar/Por _color de la etiqueta"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordenar/Por _marca"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ver/_Ordenar/Por _no leído"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordenar/Por adj_unto"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordenar/N_o ordenar"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordenar/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordenar/Ascendente"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordenar/Descendente"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordenar/Atraer _por asunto"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista jerárquica"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos los hilos"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos los hilos"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Ver/Elementos visibles..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaje a_nterior"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaje s_iguiente"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin leer"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Siguiente sin leer"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaje nue_vo anterior"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaje n_uevo s_iguiente"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaje marcado a_nterior"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje marcado"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaje etiquetado anterior"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje etiquetado"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/Codificación de caract_eres/_Autodetectar"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ver/Codificación de caract_eres/Europeo occidental (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 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:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/Codificación de caract_eres/Japonés (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/Codificación de caract_eres/Chino tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/Codificación de caract_eres/Chino (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en una ventana _nueva"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Ver/Todas las cabeceras"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Mensaje"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaje/Reci_bir"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaje/Reci_bir/De la cuenta a_ctual"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaje/Reci_bir/De tod_as las cuentas"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Mensaje/Reci_bir/Ca_ncelar recepción"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaje/Reci_bir/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaje/Enviar mensa_jes en cola"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaje/Componer _nuevo mensaje"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Mensaje/_Responder"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaje/Respon_der a"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaje/Respon_der a/A _todos"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaje/Respon_der a/Al _remitente"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaje/Respon_der a/A la _lista de correo"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Mensaje/_Reenviar"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaje/Reen_viar como adjunto"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaje/Red_irigir"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaje/M_over..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaje/_Copiar..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Mensaje/_Marcar"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaje/_Marcar/_Marcar"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaje/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaje/_Marcar/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaje/_Marcar/Marcar como no leído"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaje/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Mensaje/_Marcar/Marcar hilo como leído"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaje/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Mensaje/_Borrar"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensaje/Es un correo _basura"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaje/No es un correo _basura"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaje/Re_editar"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Herramientas/Añadir remitente a la age_nda..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Herramientas/_Filtrar todos los mensajes de la carpeta"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Herramientas/_Filtrar los mensajes seleccionados"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Herramientas/_Filtrar mensajes basura en la carpeta"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Herramientas/_Filtrar mensajes basura en los seleccionados"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Herramientas/Borrar los mensajes re_petidos"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Ejecutar el proceso marcado"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Herramientas/_Ventana de traza"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comunes..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Acciones..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias de la cuenta actual..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear una _nueva cuenta..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar cuentas..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar la cuenta actual"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Ayuda/_Manual"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ayuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ayuda/_Manual/_Japonés"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/_Ayuda/_FAQ"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ayuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ayuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ayuda/_FAQ/_Español"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ayuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ayuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/_Ayuda/Opciones de línea de ordenes"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Ayuda/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Creando ventana principal...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "ninguna"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambiando el tipo de separación de ventana de %d a %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Esta desconectado. ¿Conectar?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Vaciar todas las papeleras"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "¿Borrar todos los mensajes de las papeleras?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3569,16 +3570,16 @@ msgstr ""
 "Si el buzón especificado ya existe entonces será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3588,67 +3589,67 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Responder a _todos"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Responder al _remitente"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr "Esta desconectado. Haga click en el icono para conectar."
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "Esta conectado. Haga click en el icono para desconectar."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Salir"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Opciones de línea de ordenes"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPCIÓN]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3676,7 +3677,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3910,7 +3911,7 @@ msgstr "Cuenta%d"
 msgid "Preferences for new account"
 msgstr "Preferencias para una nueva cuenta"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Preferencias de la cuenta"
 
@@ -3923,7 +3924,7 @@ msgid "Receive"
 msgstr "Recibir"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Enviar"
 
@@ -4137,7 +4138,7 @@ msgstr "Autentificación con POP3 antes de enviar"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Firma"
 
@@ -4597,7 +4598,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Editor"
 
@@ -5698,7 +5699,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Borrar [...] o (...) al inicio del asunto al responder"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cuenta"
 
@@ -5911,80 +5912,90 @@ msgstr "Imprimir"
 msgid "Print message"
 msgstr "Enviar mensaje"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Paso"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Servidor de recepción"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Ejecutar el proceso marcado"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Preferencias comunes"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Enviar después"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Insertar fichero"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Agregar firma"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Recortar todas las líneas largas"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6236,7 +6247,7 @@ msgstr "No se encontró firma"
 msgid "Good signature from \"%s\""
 msgstr "Firma válida de «%s»"
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Firma válida"
 
@@ -6245,7 +6256,7 @@ msgstr "Firma válida"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Firma válida pero la clave para «%s» no es fiable"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Firma válida (clave no fiable)"
 
@@ -6281,7 +6292,7 @@ msgstr "La firma es válida pero la clave usada ha sido revocada"
 msgid "BAD signature from \"%s\""
 msgstr "Firma INVÁLIDA de «%s»"
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "Firma INVÁLIDA"
 
@@ -6726,41 +6737,45 @@ msgstr "el fichero %s ya existe\n"
 msgid "Creating text view...\n"
 msgstr "Creando vista de texto...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Este mensaje no puede visualizarse.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "_Guardar imagen como..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Componer mensaje _nuevo"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Añadir _remitente a la agenda..."
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "Copiar esta di_rección"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "_Abrir con el navegador web"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Copiar el en_lace"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6772,7 +6787,7 @@ msgstr ""
 "URL aparente (%s).\n"
 "¿Quiere abrirla de todas maneras?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
diff --git a/po/et.po b/po/et.po
index b14a6cf5..908f9ee5 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+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"
@@ -52,167 +52,167 @@ msgstr "Saadan kirja (%d / %d baiti)"
 msgid "Moving messages %s to %s ..."
 msgstr "Liigutan kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ei suutnud seada kustutatu lippu: %d\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "ei suuda väljastada\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ei suutnud seada kustutatu lippu: 1:%d\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "*Märgi faili ei leidunud.\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "Nimistu saamisel tekkis viga.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ei suuda luua '%s'\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ei suuda luua '%s' Sisendkasti all\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ei suuda luua kirjakasti: Nimistu ebaõnnestus\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "ei suuda luua kirjakasti\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, 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:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "ei suuda kustutada kirjakasti\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "ei suuda võtta ümbrikut\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "ümbriku võtmisel tekis viga.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ei suutnud avada ümbrikut: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "ei suutnud leida nime asukohta\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autoriseerimise meetod"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 sissekirjutus ebaõnnestus.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ei suuda %s-d lisada %s-i\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(saadan faili...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ei suuda lisada kirja %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ei suuda %d-d kopeerida %s-i\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, 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:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, 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:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
@@ -304,20 +304,20 @@ msgstr "Ekspordime teated %s-ist %s-i ...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "ei saa kirja kopeerida %s-st %s-i\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Ei suutnud avada märgi faili.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "lähtekaust on identne sihtkaustale.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -326,7 +326,7 @@ msgstr ""
 "Fail %s on juba olemas.\n"
 "Ei saa kausta luua."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -600,12 +600,12 @@ msgstr "  Pealkiri: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Väljalaskja: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "Ei suuda muuta faili omadusi\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s-i kirjutamine ebaõnnestus.\n"
@@ -687,7 +687,7 @@ msgstr ""
 "'G' tulbas lubamaks kirjade võtmist kasutades 'Võta kõik'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -822,7 +822,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Lisa aadress raamatusse"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Aadress"
 
@@ -835,7 +835,7 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fail"
@@ -858,9 +858,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Fail/Uus _Server"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Fail/---"
@@ -882,11 +882,11 @@ msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
@@ -923,7 +923,7 @@ msgstr "/_Aadress/R_edigeeri"
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Tööriist"
@@ -932,12 +932,12 @@ msgstr "/_Tööriist"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
@@ -984,7 +984,7 @@ msgstr "/R_edaktor/_Aseta"
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Aadressiraamat"
 
@@ -1049,7 +1049,7 @@ msgstr ""
 "Kas te soovite kustutada kataloogi `%s' JA kõik aadressid ?\n"
 "Kui kustutate ainult kataloogi, siis aadressid kantakse pealmisse kausta."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
@@ -1208,15 +1208,15 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Märkus"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Viga"
 
@@ -1322,7 +1322,7 @@ msgstr "/R_edigeeri/_Tühista"
 msgid "/_Edit/_Redo"
 msgstr "R_edigeeri/_Ennista"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/R-edaktor/---"
@@ -1335,7 +1335,7 @@ msgstr "/R_edaktor/_Lõika"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/R_edaktor/Aseta kui tsitaat"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/R_edaktor/_Märgi kõik"
 
@@ -1352,7 +1352,7 @@ msgstr "/R_edaktor/Ää_rista kõik pikad read"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Vaade"
@@ -1374,9 +1374,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Vaade/_Vasta"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_vaade/---"
 
@@ -1397,7 +1397,7 @@ msgstr "/_Vaade/_Manus"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
@@ -1409,138 +1409,138 @@ msgstr ""
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vaade/_Kooditabel/7bitine ascii (US-ASCII)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vaade/_Kooditabel/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vaade/_Kooditabel/Kesk-Euroopa (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vaade/_Kooditabel/_Balti (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vaade/_Kooditabel/Balti (ISO-8859-_4)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vaade/_Kooditabel/Greeka (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vaade/_Kooditabel/Türgi (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (KOI8-_R)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vaade/_Kooditabel/Kirillits (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vaade/_Kooditabel/Lihtsustatud Hiina (_GB2312)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiine (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vaade/_Kooditabel/Tai (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vaade/_Kooditabel/Tai (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Tööriist/_Aadressiraamat"
 
@@ -1548,13 +1548,13 @@ msgstr "/_Tööriist/_Aadressiraamat"
 msgid "/_Tools/_Template"
 msgstr "/_Tööriist/_Mall"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Tööriist/---"
@@ -1593,71 +1593,71 @@ msgstr "faili %s ei leidu\n"
 msgid "Can't get text part\n"
 msgstr "Ei saa tekstiosa kätte\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "*Tsitaadimärgi formaadi viga."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Kirja vasta/edasta formaadi viga."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Faili %s ei leidu\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ei saanud failile %s suurust\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Fail %s on tühi."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "ei suuda lugeda %s-i"
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Kiri: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Kirjuta kiri%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 #, fuzzy
 msgid "Empty subject"
 msgstr "Pealkiri"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Päälkiri on tühi. Kas saadame igal juhul?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "ei leia saajate nimistut."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1665,22 +1665,22 @@ msgstr ""
 "Kirja saatmiseks pole määratud kasutajtunnust.\n"
 "Palun vali kirja konto enne saatmist."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Kirja ei õnnestunud asetada väljunute kausta."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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:3027
+#: src/compose.c:3035
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1690,12 +1690,12 @@ msgstr ""
 "Ei suuda transleerida kirja tekstikoodi.\n"
 "Kas igatahes saata ?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1704,15 +1704,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1721,86 +1721,86 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "Ei suuda eemaldada vana kirja\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "Asetan kirja järjekorda...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "järjekorra kausta ei leidunud\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "Ei suutnud kirja järjekorda asetada\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Loodud Kirja-ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Loon kirjutamise akent...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Tööriist/Tegevused"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "MIME tüüp"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Suurus"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1810,52 +1810,52 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -2013,12 +2013,12 @@ msgstr "Redigeeri kausta"
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi või kaust:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -2186,42 +2186,42 @@ msgstr "Kirja jada kataloog"
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Saabunud"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Saadetud"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Järjekord"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Prügikast"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "Uus Kaust"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Sümbol `%c' ei saa olla lisatud kausta nimele."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Kaust %s on juba olemas."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ei suuda luua kausta %s."
@@ -2314,59 +2314,59 @@ msgstr "Sean kausta info...\n"
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "Uuenda kausta puu"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Kõigis kaustades otsitakse uusi kirju..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Valitud on kaust %s\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Saadan kirja"
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2376,26 +2376,26 @@ msgstr ""
 "(kui soovite luua kausta, millesse saaks teisi kaustu lisada,\n"
 " siis lisage / nime lõppu)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Sisesta uus nimi %s-le:"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Nimeta kaust ümber"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2404,12 +2404,12 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Kustuta kaust"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2420,21 +2420,21 @@ msgstr ""
 "Kustutatakse kõik kaustad ja kirjad %s-s.\n"
 "Kas sa tõesti soovid kustutada?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2443,34 +2443,34 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas tõesti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas tõesti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas tõesti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
@@ -2616,202 +2616,202 @@ msgstr "Soome"
 msgid "Sylpheed: %d new messages"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autoriseerimine"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Võtan uusi kirju"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "*Juures"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Katkestatud"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Tirin"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Valmis (uusi kirju pole)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Autoriseerimine ebaõnnestus"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Lukustatud"
 
-#: src/inc.c:727
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Ajalimiit (sek)"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Lõpetatud (%d uut kirja)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Lõpetatud (uusi kirju pole)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Tekksiid mõned vead kirjade võtmisel."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "võtan uued kirjad kontolt %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autoriseerimine"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Uute kirjade võtmine"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ühendan POP3 serveriga: %s ..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ei suuda ühenduda POP3 serveriga %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Autoriseerin..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Võtan uute kirjade arvu (STAT)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Võtan uute kirjade arvu (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Võtan kirjade suuruse (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Kustutan kirja %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Väljun"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Võtan kirja (%d /%d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Valmis (%d kirja (%s)-st võetud)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 #, fuzzy
 msgid "Connection failed."
 msgstr "Ühendus ebaõnnestus"
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Ketas täis."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ei saa kirjutada faili.\n"
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 #, fuzzy
 msgid "Socket error."
 msgstr "Soketi viga\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Kirjakast on lukus."
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autoriseerimise meetod"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Sissekanne peatatud\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Võtame uued teated %s-ist %s-i.\n"
@@ -2936,7 +2936,7 @@ msgstr "kirjad järjekorras"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Mõned saatmata kirjad on järjekooras. Lõpetame?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2945,709 +2945,709 @@ msgstr ""
 "OpenPGP toetus keelustatud."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "üks teine Sylpheed juba töötab.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Tegevuste konfiguratsiooni kirjutamine...\n"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Fail/_Kaust"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fail/_Kaust/_Loo uus kaust..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fail/_Kaust/_Nimeta kaust ümber"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fail/_Kaust/_Nimeta kaust ümber"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fail/_Kaust/_Kustuta kaust"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Fail/_Lisa kirjakast..."
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fail/_Lisa kirjakast..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Ee_malda kirjakst"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fail/_Kaust"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Vaata uusi kirju"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Fail/_Vaata uusi kirju kõigis kaustades"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Uuenda kausta puu"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fail/_Impordi kirjakasti fail..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fail/_Ekspordi kirjakasti faili..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Fail/_Tühjenda prügikast"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Fail/_Salvesta kui..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Fail/_Salvesta kui..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Fail/_Trüki..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Fail/L_isa fail"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Fail/_Välju"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/R_edaktor/Märgi _teema"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redaktor/_Leia käesolevast kirjast..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Redaktor/_Otsi kirju..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Vaade/Näita või varja"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vaade/Näita või varja/Kausta_puud"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vaade/Näita või varja/Kirja_vaadet"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vaadde/Näita või varja/_Nupuribal"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/Pilti _ja teksti"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, 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:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Pilti"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Teksti"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vaade/Näita või varja/_Nupuribal/_Mitte midagi"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Vaade/Näita või varja/Staatusri_ba"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vaade/Näita või varja/Staatusri_ba"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vaade/Eraldi kausta puu"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Vaade/Eraldi kirja vaade"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Vaade/_Sorteeri"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vaade/_Sorteeri/_numbri järgi"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vaade/_Sorteeri/_suuruse järgi"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vaade/_Sorteeri/_kuupäeva järgi"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Vaade/_Sorteeri/_kuupäeva järgi"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vaade/_Sorteeri/_vormi järgi"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vaade/_Sorteeri/_suuruse järgi"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vaade/_Sorteeri/_pealkirja järgi"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vaade/_Sorteeri/v_ärvi järgi"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vaade/_Sorteeri/_märgi järgi"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vaade/_Sorteeri/m_itteloetute järgi"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vaade/_Sorteeri/kirja_lisade järgi"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vaade/_Sorteeri/Ära sorteeri"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Vaade/_Sorteeri/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/Vaade/_Sorteeri/Kasvavas järjekorras"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vaade/_Sorteeri/*'_Attract' subjekti järgi"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Vaade/Teema_vaade"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Vaade/Paisuta kõik teemad"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vaade/Sulge kõik teemad"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Vaade/Mää_ra näidatavad parameetrid"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Vaade/_Ava"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vaade/_Ava/Eelmine kiri"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vaade/_Ava/Järgmine kiri"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Vaade/_Ava/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Vaade/_Ava/_Eelmine mitteloetud kiri"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vaade/_Ava/_Järgmine mitteloetud kiri"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vaade/Mine/Eelmisele uuele kirjale"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vaade/Mine/Järgmisele uuele kirjale"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vaade/_Ava/Eelmine _märgitud kiri"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vaade/_Ava/Järgmine m_ärgitud kiri"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vaade/_Ava/Eelmine _sildiga kiri"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vaade/_Ava/Jägmine s_ildiga kiri"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vaade/_Kooditabel/Määra _Automaatselt"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vaade/_Kooditabel/Lääne-Euroopa (ISO-8859-_15)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vaade/_Kooditabel/Jaapan (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vaade/_Kooditabel/Traditsionaalne Hiina (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vaade/_Kooditabel/Hiina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/Vaade/Ava uues aknas"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Vaade/Näita kirja lähtekoodi"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Vaade/Kõik päised"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Kiri"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Kiri/Võta _kõigilt kontodelt"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:755
 #, fuzzy
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Kiri/Katkesta kirjade võtmine"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Kiri/_Saada järjekorras olevad kirjad"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Kiri/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Kiri/Uus k_iri"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Kiri/_Vasta"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Kiri/Vasta/k_õigile"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Kiri/Vas_ta/_saatjale"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Kiri/Vasta/kirja _listi"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Kiri/Saada _edasi"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Kiri/Saada edasi _manusena"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Kiri/Suuna _ümber"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Kiri/_Nihuta..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Kiri/K_opeeri..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Kiri/M_ärk"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Kiri/M_ärk/M_ärgi"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Kiri/M_ärk/_Eemaldan märgi"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Kiri/M_ärk/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Kiri/M_ärk/Märgin _mitteloetuks"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Kiri/M_ärk/Märgin _loetuks"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Kiri/M_ärk/Märgin _loetuks"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Kiri/M_ärk/Märgin _kõik loetuks"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Kiri/Kustuta"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Kiri/Võta _uued kirjad"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Kiri/Kirjuta _ümber"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Tööriist/Lisa saatja aadressi raamatusse"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Tööriist/Loo filtri reeglistik"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Tööriist/Loo filtri reeglistik/Automaatselt"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades Kellelt"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Tööriist/Loo filtri reeglistik/kasutades Kellele"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Tööriist/Loo filtri reeglistik/ kasutades päälkirja"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Tööriist/_Filtreeri kirjad"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Tööriist/_Kustuta topelt kirjad"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Käivita märgitud protsess"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Tööriist/_Teadete aken"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Häälestus"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Häälestus/_Üldised omadused..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Häälestus/_Filtri seaded..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Häälestus/_Mall..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Häälestus/Tegevused..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Häälestus/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Häälestus/_Hetkel kasutatava konto omadused..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Häälestus/_Loo uus konto..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Häälestus/_Redigeeri kontosid..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Häälestus/_Muuda kasutatavat kontot"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Abi/_Juhend"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Abi/_Juhend/_Inglise"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Abi/_Juhend/_Jaapani"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/_Abi/_KKK"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Abi/_KKK/_Inglise"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Abi/_KKK/_Saksa"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Abi/_KKK/_Hispaania"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Abi/_KKK/_Prantsuse"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Abi/_KKK/_Itaalia"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Käsurida ei ole sisestatud."
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Abi/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Loon peamise akna...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "tehtud.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Tiitlita"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "mittemiski"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Muudan akna eraldamise tüüpi %d-lt %d-le\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Tühjenda prügikast"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Lisa kirjakast"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3657,16 +3657,16 @@ msgstr ""
 "Sisesta kirjakasti asukoht.\n"
 "Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3675,72 +3675,72 @@ msgstr ""
 "Kirjakasti loomine ebaõnnestus.\n"
 "Võibolla mõned failid on olemas, või teil pole õigusi sinna kirjutamiseks."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - kausta vaade"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Vastan"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Vasta ja saada koopia kõigile, kes said selle kirja"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Välju"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Lõpetame programmi töö."
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 #, fuzzy
 msgid "Command line options"
 msgstr "Käsurida ei ole sisestatud."
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kauta: %s [SEADED]...\n"
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3756,7 +3756,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3979,7 +3979,7 @@ msgstr "Konto%d"
 msgid "Preferences for new account"
 msgstr "Uue konto omadused"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Konto omadused"
 
@@ -3992,7 +3992,7 @@ msgid "Receive"
 msgstr "Saabuvad kirjad"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Saada"
 
@@ -4214,7 +4214,7 @@ msgstr "Autoriseeri POP3 enne saatmist"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Allkiri"
 
@@ -4676,7 +4676,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Redaktor"
 
@@ -5841,7 +5841,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
@@ -6058,81 +6058,91 @@ msgstr "Trüki"
 msgid "Print message"
 msgstr "Saada kiri"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Samm"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Sissetulevate kirjade server"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Käivita"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Käivita märgitud protsess"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Seaded"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Üldised omaduse"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Saada kiri"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Hiljem"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Pane järjekorda ja saada hiljem"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Mustand"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Salvesta mustandite kausta"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Lisa"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Lisa fail"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Manusta"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Manusta fail"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 #, fuzzy
 msgid "Append signature"
 msgstr "HALB allkiri"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Redigeeri välise redaktoriga"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Reaäär"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Murra kõik pikad read"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Vaade/_Ava/Teine kaust..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6389,7 +6399,7 @@ msgstr "Allkirja ei leidunud"
 msgid "Good signature from \"%s\""
 msgstr "\"%s\"-lt on hea allkiri"
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Hea allkiri"
 
@@ -6398,7 +6408,7 @@ msgstr "Hea allkiri"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6435,7 +6445,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "Halb allkiri \"%s\"-lt"
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "HALB allkiri"
 
@@ -6892,47 +6902,51 @@ msgstr "fail %s on juba olemas\n"
 msgid "Creating text view...\n"
 msgstr "Loon tekstivaate...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "kirja ei saanud\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Salveta kui..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Lisa saatje aadressi raamatusse"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Üldine aadress"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Weebi sirvur"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6941,7 +6955,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index cbe039d7..bf40194d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2007-02-15 14:25+0100\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -61,161 +61,161 @@ msgstr "Ajout des messages à %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "Déplacement des messages de %s vers %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copie des messages de %s vers %s ..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Effacement des messages %s"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "impossible de marquer pour la suppression : %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "impossible de purger\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Effacement de tous les messages dans %s"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "impossible de marquer pour la suppression : 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "impossible de fermer le dossier\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "le dossier racine %s n'existe pas\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "Une erreur est survenue lors de la réception de LIST.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Impossible de créer « %s »\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Impossible de créer « %s » sous Réception \n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "impossible de créer la boîte aux lettres\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, 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:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "impossible de supprimer la boîte aux lettres\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "Impossible de faire une enveloppe\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Réception des en-têtes de message (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "erreur lors de la lecture de l'enveloppe.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "impossible d'analyser l'enveloppe : %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, 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:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "Impossible d'obtenir l'espace nom\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "erreur avec la commande IMAP : STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "L'authentification IMAP4 a échoué.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "Échec au login IMAP4.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "Impossible de d'ajouter %s à %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(envoi du fichier...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossible d'ajouter le message à %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossible de copier %s vers %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erreur avec la commande IMAP : STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erreur lors de la commande IMAP : EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "erreur avec la commande IMAP : CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, 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:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut convertir de %s vers UTF-7\n"
@@ -307,20 +307,20 @@ msgstr "Exportation des messages de %s vers %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "Impossible de copier le message de %s à %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Impossible d'ouvrir le fichier des marques.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "dossier source identique à la destination.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copie du message %s%c%d vers %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -329,7 +329,7 @@ msgstr ""
 "Le fichier « %s » existe déjà.\n"
 "Impossible de créer le dossier."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -608,12 +608,12 @@ msgstr "  Sujet : %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Délivré par : %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "impossible de modifier les droits d'accès du fichier\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "L'écriture dans %s a échoué.\n"
@@ -697,7 +697,7 @@ msgstr ""
 "correspondant lorsque « Tout relever » est activé"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -832,7 +832,7 @@ msgstr "Argument de l'action"
 msgid "Add Address to Book"
 msgstr "Ajouter l'adresse au carnet"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresse"
 
@@ -845,7 +845,7 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichier"
@@ -867,9 +867,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Fichier/---"
@@ -891,11 +891,11 @@ msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
@@ -932,7 +932,7 @@ msgstr "/_Adresse/Édit_er"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Outils"
@@ -941,12 +941,12 @@ msgstr "/_Outils"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
@@ -991,7 +991,7 @@ msgstr "/Co_ller"
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
@@ -1057,7 +1057,7 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
@@ -1216,15 +1216,15 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Erreur"
 
@@ -1324,7 +1324,7 @@ msgstr "/É_dition/_Annuler"
 msgid "/_Edit/_Redo"
 msgstr "/É_dition/_Refaire"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/É_dition/---"
@@ -1337,7 +1337,7 @@ msgstr "/É_dition/Co_uper"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/É_dition/Coller comme ci_tation"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/É_dition/Tout sélectio_nner"
 
@@ -1353,7 +1353,7 @@ msgstr "/É_dition/Justifier tout le _message"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/É_dition/Justification aut_omatique"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Affichage"
@@ -1375,9 +1375,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Affichage/_Répondre à"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Affichage/---"
 
@@ -1397,7 +1397,7 @@ msgstr "/_Affichage/_Pièce(s) jointe(s)"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Affichage/Personnaliser la _barre d'outils..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Affichage/_Jeu de caractères"
 
@@ -1408,112 +1408,112 @@ msgstr "/_Affichage/_Jeu de caractères/_Automatique"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Affichage/_Jeu de caractères/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Affichage/_Jeu de caractères/ASCII 7 bits (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Affichage/_Jeu de caractères/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Affichage/_Jeu de caractères/Europe centrale (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Affichage/_Jeu de caractères/Balte (Windows-1257)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Affichage/_Jeu de caractères/Grec (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Affichage/_Jeu de caractères/Arabe (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Affichage/_Jeu de caractères/Arabe (Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Affichage/_Jeu de caractères/Hébreu (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Affichage/_Jeu de caractères/Turc (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (KOI8-U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Affichage/_Jeu de caractères/Cyrillique (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois simplifié (GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Affichage/_Jeu de caractères/Thaï (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Outils/_Carnet d'adresses"
 
@@ -1521,13 +1521,13 @@ msgstr "/_Outils/_Carnet d'adresses"
 msgid "/_Tools/_Template"
 msgstr "/_Outils/_Modèle"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Outils/_Actions"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
@@ -1561,72 +1561,72 @@ msgstr "%s : le fichier n'existe pas\n"
 msgid "Can't get text part\n"
 msgstr "Impossible d'obtenir la partie texte\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Erreur du format de citation."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 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:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Le fichier %s n'existe pas\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossible d'obtenir la taille de %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Le fichier %s est vide."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossible de lire %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Message : %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Composition%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Sujet absent"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Le sujet est vide. Envoyer malgré cela ?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "liste de destinataires vide."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1634,21 +1634,21 @@ 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:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Une erreur est survenue lors de l'envoi du message à %s ."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Impossible d'enregistrer de message dans la boîte de messages envoyés"
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1659,11 +1659,11 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer avec %s ?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Erreur de conversion de code"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1676,15 +1676,15 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'envoyer ?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Longueur de ligne maximale"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr "Chiffrement avec « Copie discrète »"
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1698,83 +1698,83 @@ msgstr ""
 "\n"
 "Envoyer quand même?"
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "Impossible d'enlever l'ancien message\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "Mise en file d'attente des messages...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "Impossible de trouver le dossier de file d'attente\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "Impossible de mettre ce message dans la file d'attente\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID créé : %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Création de la fenêtre de composition...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "Signature PGP"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "Type MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Taille"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, 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:5724
+#: src/compose.c:5732
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1783,50 +1783,50 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d) ?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr "Personnaliser la _barre d'outils..."
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 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:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle « %s » ?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -1985,12 +1985,12 @@ msgstr "Édition du dossier"
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -2158,42 +2158,42 @@ msgstr "Sélectionnez un dossier"
 msgid "Select folder"
 msgstr "Choix d'un dossier"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Réception"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Envoyé"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "File d'attente"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "« %c » n'est pas valide dans le nom du dossier."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier « %s » existe déjà."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossible de créer le dossier « %s »."
@@ -2280,57 +2280,57 @@ msgstr "Enregistrement des données des dossiers...\n"
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Reconstruire l'_arborescence"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'arborescence va être reconstruite. Poursuivre ?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstruction de l'arborescence a échoué."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Recherche des nouveaux messages..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Indésirable"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Dossier %s sélectionné\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Téléchargement des messages dans %s ..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr ""
 "Une erreur est survenue lors du téléchargement des messages dans « %s »."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2340,26 +2340,26 @@ msgstr ""
 "(si vous voulez créer un dossier pouvant contenir d'autres dossiers,\n"
 " ajouter `/' à la fin du nom)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Saisissez le nouveau nom pour « %s » :"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossible de renommer le dossier « %s »."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossible de déplacer le dossier « %s »."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2368,11 +2368,11 @@ msgstr ""
 "Effacer le dossier de tri « %s » ?\n"
 "Les messages existants ne seront PAS effacés du disque."
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Effacer le dossier de tri"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2385,20 +2385,20 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment les effacer ?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible d'effacer le dossier « %s »."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Effacer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2407,34 +2407,34 @@ msgstr ""
 "Ne plus utiliser la boîte aux lettres « %s » (les\n"
 "messages existants ne seront PAS effacés du disque) ?"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 « %s » ?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion « %s » ?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte « %s » des groupes de discussion ?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
@@ -2582,142 +2582,142 @@ msgstr "Terminé"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed : %d nouveau(x) message(s)"
 
-#: src/inc.c:478
+#: src/inc.c:481
 msgid "Authenticating with POP3"
 msgstr "Authentification POP3"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Récupération des nouveaux messages"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Attente"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Récupération"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Terminé - %d message(s) %s reçu(s)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Terminé - pas de nouveau(x) message(s)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "L'authentification a échoué"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Délai d'attente"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminé - %d nouveau(x) message(s)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Terminé - pas de nouveau(x) message(s)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Erreur lors de la récupération des messages."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "Récupération des nouveaux messages du compte %s ...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s : Authentification POP3"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Récupération des nouveaux messages"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connexion au serveur POP3 : %s..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Authentification..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Réception des messages de %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Récupération du nombre de nouveaux messages (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Récupération du nombre de nouveaux messages (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Récupération du nombre de nouveaux messages (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Suppression du message %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Réception - %d message(s) %s reçu(s)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "La connexion a échoué."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2726,28 +2726,28 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Impossible d'écrire dans le fichier."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Erreur de protocole."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "La connexion a été fermée par le serveur."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Boîte verrouillée."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2756,11 +2756,11 @@ msgstr ""
 "Boîte verrouillée :\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "L'authentification à échoué."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2769,15 +2769,15 @@ msgstr ""
 "L'authentification a échoué :\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Dépassement du délai de réponse (timeout) de la session."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Relève du courrier annulée\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Récupération des nouveaux messages de %s dans %s...\n"
@@ -2915,7 +2915,7 @@ msgstr ""
 "Quelques messages non envoyés sont dans la file d'attente. Quitter "
 "maintenant ?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2924,15 +2924,15 @@ msgstr ""
 "Support OpenPGP désactivé."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "une autre session de Sylpheed existe.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2940,655 +2940,656 @@ msgstr ""
 "Une ancienne version de configuration a été trouvée.\n"
 "Voulez-vous migrer vers la nouvelle ?"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Fichier/_Dossier"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fichier/_Dossier/Créer un _nouveau dossier..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fichier/_Dossier/_Renommer le dossier..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fichier/_Dossier/_Déplacer le dossier..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fichier/_Dossier/_Supprimer le dossier"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Fichier/_Boîte aux lettres"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fichier/_Boîte aux lettres/Ajouter une _boîte aux lettres..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fichier/_Boîte aux lettres/_Supprimer la boîte aux lettres"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fichier/_Boîte aux lettres/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fichier/_Boîte aux lettres/Re_chercher les nouveaux messages"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 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:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fichier/_Boîte aux lettres/Reconstruire l'_arborescence"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fichier/_Importer un fichier mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fichier/_Exporter vers un fichier mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Fichier/_Vider les corbeilles"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Fichier/Enregistrer _sous..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 msgid "/_File/Page set_up..."
 msgstr "/_Fichier/_Mise en page..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Fichier/Im_primer..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Fichier/_Travailler déconnecté"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Fichier/_Quitter"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/É_dition/Sélectionner l'en_filade"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/É_dition/Rechercher dans le _message..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/É_dition/Rechercher dans le _dossier..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Affichage/Affic_her ou masquer"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Affichage/Affic_her ou masquer/Fenêtre des _dossiers"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Affichage/Affic_her ou masquer/Fenêtre de _message"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 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:570
+#: src/mainwindow.c:572
 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:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Icônes seulement"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Affichage/Affic_her ou masquer/Barre d'_outils/_Textes seulement"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 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:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Affichage/Affic_her ou masquer/Barre de _recherche"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Affichage/Affic_her ou masquer/_Barre d'état"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Affichage/Personnaliser la _barre d'outils..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Affichage/Séparer la fenêtre des _dossiers"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/_Affichage/Séparer la fenêtre des _messages"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Affichage/_Trier"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Affichage/_Trier/Trier par _numéro"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Affichage/_Trier/Trier par _taille"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Affichage/_Trier/Trier par _date"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Affichage/_Trier/Trier par date (en_filades)"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Affichage/_Trier/Trier par e_xpéditeur"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Affichage/_Trier/Trier par d_estinataire"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Affichage/_Trier/Trier par _sujet"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Affichage/_Trier/Trier par _couleur"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Affichage/_Trier/Trier par _marque"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Affichage/_Trier/Trier par non _lu"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Affichage/_Trier/Trier par pièce _jointe"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Affichage/_Trier/Ne _pas trier"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Affichage/_Trier/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Affichage/_Trier/_Ordre croissant"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Affichage/_Trier/O_rdre décroissant"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Affichage/_Trier/_Attirer par sujet"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Affichage/Affichage par _fil de conversation"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Affichage/Dé_ployer les fils de conversation"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Affichage/_Compacter les fils de conversation"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Affichage/Sélect_ion des éléments affichés..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Affichage/_Aller à"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Affichage/_Aller à/Message _précédent"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Affichage/_Aller à/Message suiva_nt"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Affichage/_Aller à/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Affichage/_Aller à/Non l_u précédent"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Affichage/_Aller à/Non _lu suivant"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Affichage/_Aller à/Message nouveau p_récédent"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Affichage/_Aller à/Message nouveau _suivant"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Affichage/_Aller à/M_arqué précédent"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Affichage/_Aller à/_Marqué suivant"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Affichage/_Aller à/C_oloré précédent"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Affichage/_Aller à/_Coloré suivant"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Affichage/_Aller à/Autre _dossier..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Affichage/_Jeu de caractères/Détection _automatique"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Affichage/_Jeu de caractères/Europe occidentale (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Affichage/_Jeu de caractères/Japonais (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois traditionnel (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Affichage/_Jeu de caractères/Chinois (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Affichage/_Ouvrir dans une nouvelle fenêtre"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Affichage/_Voir le message complet"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/_Affichage/Afficher tous le_s en-têtes"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Affichage/Mettre à jo_ur le résumé des messages"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Message"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/_Message/Réce_ptionner"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Message/Réce_ptionner/le courrier du _compte courant"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Message/Réce_ptionner/le courrier de _tous les comptes"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Message/Réce_ptionner/_Annuler la réception"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Message/Réce_ptionner/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Message/En_voyer les messages en file d'attente"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Message/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Message/Composer un _nouveau message"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Message/_Répondre"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Message/Rép_ondre à"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Message/Rép_ondre à/_tous"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Message/Rép_ondre à/l'_expéditeur"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Message/Rép_ondre à/la _liste"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Message/_Transférer"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Message/Transférer en tant que pièce _jointe"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Message/Rediri_ger"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Message/_Déplacer..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Message/_Copier..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Message/_Marquer"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Message/_Marquer/_Marquer"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Message/_Marquer/_Démarquer"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Message/_Marquer/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Message/_Marque/Marquer comme _non lu"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Message/_Marque/Marquer comme _lu"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Message/_Marque/Marquer l'en_filade comme lue"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Message/_Marque/Marquer _tous comme lu"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Message/_Supprimer"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Message/Marquer comme indésira_ble"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Message/Marquer comme acc_eptable"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/Réé_diter"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Outils/Aj_outer l'expéditeur dans le carnet d'adresses..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Outils/_Filtrer les messages du dossier"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Outils/Filtrer les messages _sélectionnés"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Outils/Créer une règle de f_iltrage"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Outils/Créer une règle de f_iltrage/automatiq_uement"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 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:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 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:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 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:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Outils/Filtrer les indésira_bles du dossier"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Outils/Filtrer les indésirables dans les _messages sélectionnés"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Outils/Supprimer les messages en _double"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Outils/E_xécuter les commandes marquées"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Outils/_Journal de connexion"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Configuration"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuration/Préférences _générales..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuration/_Filtres..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuration/_Modèles..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuration/_Actions..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Configuration/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuration/_Configuration du compte courant..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuration/Création d'un _nouveau compte..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuration/Édition des compt_es..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuration/Choi_sir un autre compte"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/A_ide/_Manuel"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/A_ide/_Manuel/_Anglais"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_ide/_Manuel/_Japonais"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Anglais"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/A_llemand"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Espagnol"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Français"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_ide/_Foire Aux Questions (FAQ)/_Italien"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/A_ide/_Options de ligne de commande"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/A_ide/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Création de la fenêtre principale...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "terminé.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "aucun"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Changement du type de séparation de fenêtre de %d vers %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Vous êtes déconnecté. Voulez-vous vous connecter ?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Vider toutes les corbeilles"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Effacer tous les messages des corbeilles ?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Nouvelle boîte aux lettres"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3597,16 +3598,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:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3616,67 +3617,67 @@ msgstr ""
 "Il se peut que les fichiers existent déjà, ou que vous n'ayez pas les droits "
 "en écriture."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Répondre"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Répondre à _tous"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Répondre à l'_expéditeur"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 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:2837
+#: src/mainwindow.c:2849
 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:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Quitter Sylpheed ?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Options de la ligne de commande"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilisation : sylpheed [OPTION]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3704,7 +3705,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3939,7 +3940,7 @@ msgstr "Compte%d"
 msgid "Preferences for new account"
 msgstr "Configuration du nouveau compte"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Configuration du compte"
 
@@ -3952,7 +3953,7 @@ msgid "Receive"
 msgstr "Réception"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Envoyer"
 
@@ -4166,7 +4167,7 @@ msgstr "S'authentifier sur le POP3 avant l'envoi"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Signature"
 
@@ -4629,7 +4630,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Éditeur de texte"
 
@@ -5732,7 +5733,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Supprimer [...] ou (...) au début du sujet lors d'une réponse"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Compte"
 
@@ -5939,79 +5940,89 @@ msgstr "Impression"
 msgid "Print message"
 msgstr "Imprimer le message"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "par pas de"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Serveur de réception"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Exécuter"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Exécuter les commandes marquées"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Préférences"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Préférences générales"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Envoyer le message"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Envoi différé"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Mettre en file d'attente et envoyer plus tard"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Brouillon"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Insertion"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Insérer un fichier"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Joindre"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Joindre un fichier"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Ajouter la signature"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Éditer avec un éditeur externe"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Justifier"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 msgid "Customize toolbar"
 msgstr "Personnalisation de la barre d'outils"
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
 "the order by using the Up / Down button."
@@ -6263,7 +6274,7 @@ msgstr "Pas de signature trouvée"
 msgid "Good signature from \"%s\""
 msgstr "Signature correcte de \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Signature correcte"
 
@@ -6272,7 +6283,7 @@ msgstr "Signature correcte"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Signature correcte mais la clé pour \"%s\" n'est pas de confiance"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Signature correcte (clé suspecte)"
 
@@ -6310,7 +6321,7 @@ msgstr "La signature est correcte mais la clé de signature a été révoquée"
 msgid "BAD signature from \"%s\""
 msgstr "Mauvaise signature de \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "MAUVAISE signature"
 
@@ -6766,11 +6777,15 @@ msgstr "le fichier %s existe déjà\n"
 msgid "Creating text view...\n"
 msgstr "Création de la vue texte...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Impossible d'afficher ce message.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -6778,31 +6793,31 @@ msgstr ""
 "Le corps du texte ne peut pas être affiché car la création du fichier "
 "temporaire a échoué.\n"
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "Enregistrer cette _image sous..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "_Ajouter au carnet d'adresses..."
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "Copier cette ad_resse"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "_Ouvrir dans le navigateur Web"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Copier ce _lien"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6814,7 +6829,7 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'ouvrir ?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Localisateur (URL) suspect"
 
diff --git a/po/gl.po b/po/gl.po
index 87b1d130..9d72cb69 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -52,166 +52,166 @@ msgstr "Enviando mensaxe (%d / %d bytes)"
 msgid "Moving messages %s to %s ..."
 msgstr "Movendo mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "non podo establecer os indicadores borrados: %d\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "non podo baleirar\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "non podo establecer os indicadores borrados: 1:%d\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Ficheiro de marcas non atopado.\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "ocurriu un erro obtendo LIST.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Non podo crear '%s'\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Non podo crear '%s' bajo Entrada\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "non podo crear a: LIST falló\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "non podo crear a caixa de correo\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, 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:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "non podo borrar a caixa de correo\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "non se pode obter a estructura da mensaxe\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "Erro obtendo a estructura da mensaxe.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Non se pode interpretar a estructura da mensaxe: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, 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:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "no se pode obter o espacio de nomes\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Fallo de autenticación"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "non podo engadir %s a %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(enviando ficheiro...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "non se pode engadir o mensaxe %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "non podo copiar %d a %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, 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:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non pode convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non pode convertir %s a UTF-7\n"
@@ -303,20 +303,20 @@ msgstr "Exportando mensaxes de %s a %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "non se pode copiar mensaxe %s a %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Non se pode abrir o ficheiro de marcas.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "carpetas de orixen e destiño idénticas.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -325,7 +325,7 @@ msgstr ""
 "o Ficheiro `%s' xa existe.\n"
 "Non podo crear a carpeta."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -596,12 +596,12 @@ msgstr "  Asunto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Xenerador: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "non se pode cambiar os permisos de ficheiro\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "fallo escribindo en %s.\n"
@@ -685,7 +685,7 @@ msgstr ""
 "na columna `G' para activar a descarga mediante `Traer todo'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -820,7 +820,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Engadir enderezo á axenda"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Enderezo"
 
@@ -833,7 +833,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Ficheiro"
@@ -856,9 +856,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
@@ -880,11 +880,11 @@ msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
@@ -921,7 +921,7 @@ msgstr "/_Enderezo/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -930,12 +930,12 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
@@ -982,7 +982,7 @@ msgstr "/_Editar/_Pegar"
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
@@ -1047,7 +1047,7 @@ msgstr ""
 "¿Quere borrar a carpeta E todos os enderezos en `%s'? \n"
 "Si so borra a carpeta os enderezos se moverán á carpeta pai."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1207,15 +1207,15 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Erro"
 
@@ -1320,7 +1320,7 @@ msgstr "/_Editar/_Desfacer"
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refacer"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
@@ -1333,7 +1333,7 @@ msgstr "/_Editar/Cor_tar"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como c_itación"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
@@ -1350,7 +1350,7 @@ msgstr "/_Editar/_Cortar todas as líneas longas"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Copiar"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Ver"
@@ -1372,9 +1372,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ver/_Respostar a"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Ver/---"
 
@@ -1395,7 +1395,7 @@ msgstr "/_Ver/_Adxuntos"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Ver/_Ordear/Descendente"
@@ -1407,138 +1407,138 @@ msgstr ""
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/_Codificación/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ver/_Codificación/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ver/_Codificación/Centroeuropeo (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Ver/_Codificación/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ver/_Codificación/Grego (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/_Codificación/Turco (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/_Codificación/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ver/_Codificación/Cirílico (KOI8-_R)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ver/_Codificación/Cirílico (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ver/_Codificación/Chines simplificado (_GB2312)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Codificación/Chines tradicional (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ver/_Codificación/Coreano (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ver/_Codificación/Tailandés (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ver/_Codificación/Tailandés (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Axenda de enderezos"
 
@@ -1546,13 +1546,13 @@ msgstr "/_Ferramentas/_Axenda de enderezos"
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/Plan_tillas"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
@@ -1591,72 +1591,72 @@ msgstr "%s: o ficheiro non existe\n"
 msgid "Can't get text part\n"
 msgstr "Non se pode obter o texto\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 #, fuzzy
 msgid "Quote mark format error."
 msgstr "Marca de cita para erro."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Erro no formato da mensaxe para respostar/redirixir "
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "o ficheiro %s non existe\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, 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:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "o Ficheiro %s esta valeiro."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Non poido ler %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compoñer mensaxe%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 #, fuzzy
 msgid "Empty subject"
 msgstr "Asunto"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "o asunto esta valeiro. ¿Enviar de todas formas?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "non se pode obter a lista de destinatarios."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1664,21 +1664,21 @@ msgstr ""
 "Non especificó ningunha conta para enviar.\n"
 "Seleccione algunha conta antes de enviar."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Non se pode gardar a mensaxe en Saida."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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:3027
+#: src/compose.c:3035
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1689,12 +1689,12 @@ msgstr ""
 "%s a %s.\n"
 "¿Envia-lo de todo xeito?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1703,15 +1703,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1720,85 +1720,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "non se pode eliminar a mensaxe antiga\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "poñendo na cola...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "non podo atopar a carpeta de cola\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "a mensaxe non se pode poñer na cola\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID generado: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Creando fiestra de composicion...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Ferramentas/Acció_ns"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, 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:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1808,52 +1808,52 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -2011,12 +2011,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -2185,42 +2185,42 @@ msgstr "Directorio de almacén"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papeleira"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' non pode estar no nome da carpeta."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "a carpeta `%s' xa existe."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Non se pode crear a carpeta `%s'."
@@ -2312,57 +2312,57 @@ msgstr "Establecendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Reconstruir arbre de carpetas"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2372,26 +2372,26 @@ msgstr ""
 "(si quere crear unha carpeta para almacenar subcarpetas,\n"
 " engada `/' o final do nome)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Renomear carpeta"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2400,12 +2400,12 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2416,21 +2416,21 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' serán borrados.\n"
 "¿Confirma o borrado?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2439,34 +2439,34 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
@@ -2612,145 +2612,145 @@ msgstr "Finalizar"
 msgid "Sylpheed: %d new messages"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autenticando"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Obtendo novos mensaxes"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "En espera"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "feito (non hai mensaxes novos)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Conexión fallida"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Autorización fallida"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: src/inc.c:727
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Tiempo límite (seg.)"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaxe(s) novo(s))"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Finalizado (non hai mensaxes novos)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Ocurriu algún erro obtendo o correo."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensaxes da conta %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autenticando"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensaxes"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ó servidor POP3: %s ..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Non se pode conectar ó servirdor POP3: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensaxes (STAT)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensaxes (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamaño de novas mensaxes (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Saíndo"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaxe (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Feito (%d mensaxe(s) (%s) recibido(s))"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 #, fuzzy
 msgid "Connection failed."
 msgstr "Conexión fallida"
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2759,28 +2759,28 @@ msgstr ""
 "Ocurriu un erro mentras se procesaba o correo:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Non hai espacio libre no disco."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Non se pode escribir o ficheiro."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Error de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "a caixa de correo esta bloqueada."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2789,12 +2789,12 @@ msgstr ""
 "a caixa de correo esta bloqueada:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Fallo de autenticación"
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2803,15 +2803,15 @@ msgstr ""
 "Fallo de autenticación:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novos mensaxes dende %s en %s...\n"
@@ -2936,7 +2936,7 @@ msgstr "Mensaxes en cola"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hai mensaxes sin enviar na cola. ¿Sair agora?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2945,708 +2945,708 @@ msgstr ""
 "Soporte para OpenPGP deshabilitado."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "xa hai outro Sylpheed executándose.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "configuración das accions"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Ficheiro/_Carpeta"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Ficheiro/_Carpeta_/Crear _nova carpeta..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Ficheiro/_Carpeta_/_Renomear carpeta..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Ficheiro/_Carpeta_/_Renomear carpeta..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Ficheiro/_Carpeta_/_Borrar carpeta"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Ficheiro/_Engadir caixa de correo"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Ficheiro/_Engadir caixa de correo"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Eliminar _mailbox"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Ficheiro/_Carpeta"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Comprobar si hai mensaxes novas"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Ficheiro/_Comprobar mensaxes novas en todas as carpetas"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/R_econstruir árbre de carpetas"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Ficheiro/I_mportar ficheiro mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Ficheiro/_Exportar a ficheiro mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Ficheiro/_Baleirar Papeleira"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Ficheiro/_Gardar como..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Ficheiro/_Gardar como..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Ficheiro/_Imprimir"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Ficheiro/_Inserir ficheiro"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Ficheiro/Sai_r"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _fio"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar na mensaxe actual..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edición/_Buscar en carpeta..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Ver/Mostrar ou o_cultar"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ver/Mostrar ou o_cultar/_Arbre de carpetas"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ver/Mostrar ou o_cultar/_Mensaxes"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/Iconos _e texto"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, 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:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Iconos"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Texto"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar ou o_cultar/_Ferramentas/_Ocultar"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar ou o_cultar/_Barra de estado"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar arb_re de carpetas"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Ver/Separar vista de m_ensaxes"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordear"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordear/Por _número"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordear/Por tamañ_o"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordear/Por _data"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Ver/_Ordear/Por _data"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordear/Por _remitente"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordear/Por _destinatario"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordear/Por as_unto"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordear/Por _cor da etiqueta"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordear/Por _marca"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Ver/_Ordear/Por _non leído"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordear/Por adxun_to"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordear/N_on ordear"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordear/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordear/Ascendente"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordear/Atraer _por asunto"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista xerárquica"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos os fios"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos os fios"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Ver/Elementos visibles..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaxe a_nterior"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaxe s_eguinte"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin ler"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Seguinte sin ler"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaxe no_va anterior"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaxe nova s_eguinte"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaxe marcada a_nterior"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Seguinte mensaxe _marcada"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaxe etiqueta_da anterior"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Seguinte Mensaxe e_tiquetada"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ver/_Codificación/_Autodetectar"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ver/_Codificación/Europeo Occidental (ISO-8859-_15)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/_Codificación/Xaponés (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Ver/_Codificación/Xaponés (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Codificación/Xaponés (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/_Codificación/Chines tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Codificación/Chines (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Codificación/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en fiestra _nova"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fonte da mens_axe"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Ver/Todas as cabeceiras"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Mensaxe"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensaxe/Recibir de tod_as as contas"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:755
 #, fuzzy
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Mensaxe/_Cancelar recepción"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaxe/Enviar mensa_xes da cola"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Mensaxe/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensaxe/Compoñer _nova mensaxe"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Mensaxe/_Respostar"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaxe/Respos_tar a"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaxe/Respos_tar a/A _todos"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaxe/Respos_tar a/Ó _remitente"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaxe/Respos_tar a/Á _lista de correo"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Mensaxe/_Reenviar"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensaxe/Reen_viar como adxunto"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensaxe/Red_irixir"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaxe/M_over..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaxe/_Copiar..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Mensaxe/_Marcar"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaxe/_Marcar/_Marcar"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaxe/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaxe/_Marcar/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaxe/_Marcar/Marcar como non leído"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaxe/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Mensaxe/_Marcar/Marcar como leído"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaxe/_Marcar/Marcar todo como leído"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Mensaxe/_Borrar"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensaxe/Rec_ibir correo novo"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaxe/Re_editar"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Ferramentas/Engadir _remitente á axenda"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Crear Regra de filtrado"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/_Automáticamente"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Dende"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada en _Para"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Crear Regra de filtrado/Baseada no _Asunto"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Ferramentas/_Filtrar Mensaxes"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/Borrar as mensaxes re_petidas"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Fiestra de traza"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Configuración"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comuns..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuración/Preferencias de _filtrado..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuración/_Plantillas ..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Accions..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias da conta actual..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nova conta..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar contas..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar conta actual"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Axuda/_Manual"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Axuda/_Manual/_Inglés"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Axuda/_Manual/_Xaponés"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/_Axuda/_FAQ"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Axuda/_FAQ/_Inglés"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Axyuda/_FAQ/_Alemán"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Axuda/_FAQ/_Español"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Axuda/_FAQ/_Francés"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Axuda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Non se estableceu o comando."
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Axuda/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Creando Fiestra principal...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Sen título"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "ningunha"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambiando o tipo de separación de fiestra de %d a %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Baleirar papeleira"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Engadir caixa de correo"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3657,16 +3657,16 @@ msgstr ""
 "Si xa existe será\n"
 "examinado automáticamente."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3676,72 +3676,72 @@ msgstr ""
 "Quizáis xa existan os ficheiros ou non teña permisos suficientes para "
 "escribir no directorio."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Arbre de carpetas"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Respostar"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Respostar a todos"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "¿Sair do programa?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 #, fuzzy
 msgid "Command line options"
 msgstr "Non se estableceu o comando."
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3757,7 +3757,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3980,7 +3980,7 @@ msgstr "conta%d"
 msgid "Preferences for new account"
 msgstr "Preferencias para unha nova conta"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Preferencias da conta"
 
@@ -3993,7 +3993,7 @@ msgid "Receive"
 msgstr "Recibir"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Enviar"
 
@@ -4215,7 +4215,7 @@ msgstr "Autenticación con POP3 antes de enviar"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Sinatura"
 
@@ -4676,7 +4676,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Editor"
 
@@ -5840,7 +5840,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "conta"
 
@@ -6056,81 +6056,91 @@ msgstr "Imprimir"
 msgid "Print message"
 msgstr "Enviar Mensaxe"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Paso"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Servidor de recepción"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Executar"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Executar o proceso marcado"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Preferencias"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Preferencias comuns"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Enviar Mensaxe"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Enviar mais tarde"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Poñer na cola e enviar mais tarde"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Borrador"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Gardar como borrador"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Inserir ficheiro"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Adxuntar"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 #, fuzzy
 msgid "Append signature"
 msgstr "Sinatura INVÁLIDA"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Recortar"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Cortar todas as líneas longas"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Ver/_Ir a/_Ir a outra carpeta"
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6386,7 +6396,7 @@ msgstr "Non se atopou sinatura"
 msgid "Good signature from \"%s\""
 msgstr "Sinatura válida de \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Sinatura válida"
 
@@ -6395,7 +6405,7 @@ msgstr "Sinatura válida"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6432,7 +6442,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INVÁLIDA de \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "Sinatura INVÁLIDA"
 
@@ -6889,47 +6899,51 @@ msgstr "o ficheiro %s xa existe\n"
 msgid "Creating text view...\n"
 msgstr "Creando vista de texto...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "unha mensaxe non será recibido\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Gardar como..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Engadir _remitente á axenda"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Enderezo común"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Navegador web"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6938,7 +6952,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index 3c19c3f4..b84c08e1 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2001-09-17 13:22+0100\n"
 "Last-Translator: Ante Karamatić <ante@cdnet.com.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -52,168 +52,168 @@ msgstr "Šaljem poruku (%d / %d bytea)"
 msgid "Moving messages %s to %s ..."
 msgstr "Premještam poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne mogu postaviti obrisane oznake: %d\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "ne mogu obrisati\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Označena datoteka ne postoji.\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "došlo je do greške prilikom dobivanja LISTe.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, fuzzy, c-format
 msgid "Can't create '%s'\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, fuzzy, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne mogu kreirati sandučić: LIST nije uspio\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "ne mogu kreirati sandučić\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, fuzzy, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne mogu kreirati sandučić\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "ne mogu obrisati sandučić\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "ne mogu dobiti omot\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "došlo je do greške prilikom dobivanja omota.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati omot: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 poslužiteljom: %s%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, fuzzy, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 poslužiteljom: %s%d\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti namespace\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autorizacija"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login propao.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu pričvrstiti %s na %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Šaljem DATA..."
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu obilježiti poruku %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "greška prilikom imap naredbe: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -305,20 +305,20 @@ msgstr "Izvozim poruke iz %s u %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "ne mogu kopirati poruku %s u %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Ne mogu otvoriti označenu datoteku.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "izvorni spis jednak je destinaciji.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -327,7 +327,7 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu stvoriti spis."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -604,12 +604,12 @@ msgstr "  Tema: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Izdavač: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "ne mogu promjeniti atribut datoteke\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "pisanje u %s nije uspjelo.\n"
@@ -692,7 +692,7 @@ msgstr ""
 "S one račune s kojih želite skinuti poštu sa `Primi sve'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -824,7 +824,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
@@ -837,7 +837,7 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -861,9 +861,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
@@ -885,11 +885,11 @@ msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Uredi"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
@@ -926,7 +926,7 @@ msgstr "/_Adresa/_Uredi"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -935,12 +935,12 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -987,7 +987,7 @@ msgstr "/_Uredi/U_baci"
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Adresar"
 
@@ -1052,7 +1052,7 @@ msgstr ""
 "Želite li obrisati spis I sve adrese u `%s' ? \n"
 "Ukoliko brišete samo spis, adrese će biti premještene u prethodni spis."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Obriši spis"
 
@@ -1205,15 +1205,15 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Obavijest"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Greška"
 
@@ -1319,7 +1319,7 @@ msgstr "/_Uredi/_Undo"
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Redo"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
@@ -1333,7 +1333,7 @@ msgstr "/_Uredi/R_eži"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/U_baci"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Odaberi _sve"
 
@@ -1350,7 +1350,7 @@ msgstr "/_Uredi/Sažmi sve duge _linije"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Pregled"
@@ -1376,9 +1376,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Znakovni standard"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
@@ -1402,7 +1402,7 @@ msgstr "Prilog"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
@@ -1414,138 +1414,138 @@ msgstr ""
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Europa (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (KOI8-_R)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Čirilica (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 #, fuzzy
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
@@ -1555,14 +1555,14 @@ msgstr "/_Alat/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Obrazac"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 #, fuzzy
 msgid "/_Tools/Actio_ns"
 msgstr "/_Izvrši"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 #, fuzzy
 msgid "/_Tools/---"
@@ -1602,71 +1602,71 @@ msgstr "%s: datoteka ne postoji\n"
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti dio tekst\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Greška formata citata."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Greška poruke odgovori/proslijedi."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, fuzzy, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna\n"
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, fuzzy, c-format
 msgid "Can't read %s."
 msgstr "ne mogu kreirati %s\n"
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu primatelja."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1674,21 +1674,21 @@ msgstr ""
 "Račun za slanje pošte nije definiran.\n"
 "Molim, odaberite račun prije slanja."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu snimiti poruku u spis poslano."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1696,12 +1696,12 @@ msgid ""
 "Send it as %s anyway?"
 msgstr "Ne mogu promjeniti charset poruke."
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1710,15 +1710,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1727,87 +1727,87 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "ne mogu ukloniti staru poruku\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "odlažem poruku...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 #, fuzzy
 msgid "can't find queue folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran ID-poruke: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Stvaram prozor za pisanje...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Izvrši"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za vanjski uređivač je pogrešna: `%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1817,53 +1817,53 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2021,12 +2021,12 @@ msgstr "Uredi spis"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog spisa:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -2194,44 +2194,44 @@ msgstr "Spool direktorij"
 msgid "Select folder"
 msgstr "Odaberite spis"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Sandučić"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 #, fuzzy
 msgid "Sent"
 msgstr "Pošalji"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "NoviSpis"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uključen u ime spisa."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Spis `%s' već postoji."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu stvoriti spis `%s'."
@@ -2325,60 +2325,60 @@ msgstr "Postavljam info spisa...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Spis %s je odabran\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2388,26 +2388,26 @@ msgstr ""
 "(ukoliko želite stvoriti spis za pohranjivanje podspisa,\n"
 "dodajte `/' na kraju imena)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Preimenuj spis"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2416,12 +2416,12 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši spis"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2432,21 +2432,21 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti će obrisane.\n"
 "Želite li ih uistinu obrisati?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2455,35 +2455,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 račun?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 račun"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news račun?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Obriši news račun"
 
@@ -2641,207 +2641,207 @@ msgstr ""
 msgid "Sylpheed: %d new messages"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autorizacija"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, fuzzy, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:705
+#: src/inc.c:708
 #, fuzzy
 msgid "Done (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Identifikacija nije uspjela"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:727
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, fuzzy, c-format
 msgid "Finished (%d new message(s))"
 msgstr "\t%d novih poruka\n"
 
-#: src/inc.c:780
+#: src/inc.c:783
 #, fuzzy
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:789
+#: src/inc.c:792
 #, fuzzy
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke s računa %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autorizacija"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 poslužitelj: %s ..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 poslužitelj: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Primam broj novih poruka (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Primam broj novih poruka (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Primam broj novih poruka (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Primam veličinu poruka (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, fuzzy, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ukloni poruke sa poslužitelja nakon primanja"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije uspjela"
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Nema više mjesta na disku."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 #, fuzzy
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku.\n"
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 #, fuzzy
 msgid "Socket error."
 msgstr "protokol greška\n"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 #, fuzzy
 msgid "Mailbox is locked."
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Postavke sandučića"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autorizacija"
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Autorizacija"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 #, fuzzy
 msgid "Incorporation cancelled\n"
 msgstr "Prima novu poštu"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke s %s u %s...\n"
@@ -2964,7 +2964,7 @@ msgstr "Odložene poruke"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlane poruke su odložene. Izaći odmah?"
 
-#: src/main.c:753
+#: src/main.c:755
 #, fuzzy
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
@@ -2974,775 +2974,775 @@ msgstr ""
 "OpenPGP podrška je onemogućena."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem konfiguraciju filtera...\n"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Spis"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Spis/Kreiraj _novi spis..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Spis/_Preimenuj spis..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datoteka/_Spis/_Preimenuj spis..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Spis/_Obriši spis"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/Dodaj _sandučić..."
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/Dodaj _sandučić..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Spis"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "Kreiranje nove pošte"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Unesi mbox datoteku"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvezi u mbox datoteku..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datotkea/Isprazni s_meće"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/Spremi _kao..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Datoteka/Spremi _kao..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/Is_piši..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Datoteka/_Unesi datoteku"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/I_zlaz"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 #, fuzzy
 msgid "/_Edit/Select _thread"
 msgstr "/_Uredi/Odaberi _sve"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 #, fuzzy
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Uredi/P_ronađi u poruci"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 #, fuzzy
 msgid "/_Edit/_Search messages..."
 msgstr "/_Traži poruka..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 #, fuzzy
 msgid "/_View/Show or hi_de"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 #, fuzzy
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pregled/_Stablo spisa"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 #, fuzzy
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pregled/_Pregled poruka"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pregled/_Traka alata"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Pregled/_Traka alata/Slike i tekst"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Pregled/_Traka alata/_Slike"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pregled/_Traka alata/_Slike"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pregled/_Traka alata/_Tekst"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pregled/_Traka alata/_Ništa"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Pregled/Stat_us traka"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 #, fuzzy
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pregled/Stat_us traka"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Pregled/Odvoji sta_blo spisa"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pregled/Odvoji pre_gled poruka"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 #, fuzzy
 msgid "/_View/_Sort"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 #, fuzzy
 msgid "/_View/_Sort/by _number"
 msgstr "/_Održavanje/Pos_loži/Posloži po _broju"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 #, fuzzy
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Održavanje/Pos_loži/Posloži po _veličini"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 #, fuzzy
 msgid "/_View/_Sort/by _date"
 msgstr "/_Održavanje/Pos_loži/Posloži po _datumu"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Održavanje/Pos_loži/Posloži po _datumu"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 #, fuzzy
 msgid "/_View/_Sort/by _from"
 msgstr "/_Održavanje/Pos_loži/Posloži po _pošiljatelju"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Održavanje/Pos_loži/Posloži po _veličini"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 #, fuzzy
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Održavanje/Pos_loži/Posloži po _temi"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 #, fuzzy
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Održavanje/Pos_loži/Posloži oznaci _boje"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 #, fuzzy
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Održavanje/Pos_loži/Posloži po _oznaci"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 #, fuzzy
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Održavanje/Pos_loži/Posloži po _nepročitanom"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 #, fuzzy
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Održavanje/Pos_loži/Posloži po _prilogu"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 #, fuzzy
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Održavanje/Pos_loži/Posloži po _nepročitanom"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 #, fuzzy
 msgid "/_View/_Sort/---"
 msgstr "/_Pregled/_Znakovni standard/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 #, fuzzy
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 #, fuzzy
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 #, fuzzy
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Održavanje/Pos_loži/P_rivuci po temi"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 #, fuzzy
 msgid "/_View/Th_read view"
 msgstr "/_Pregled/_Pregled poruka"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 #, fuzzy
 msgid "/_View/E_xpand all threads"
 msgstr "Raširi stablo"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 #, fuzzy
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 #, fuzzy
 msgid "/_View/Set display _item..."
 msgstr "/Održavanje/Postavi po_jedinosti prikaza"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 #, fuzzy
 msgid "/_View/_Go to"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 #, fuzzy
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Održavanje/Idi pre_ma/_Prethodna poruka"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 #, fuzzy
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Održavanje/Idi pre_ma/Slij_edeća poruka"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 #, fuzzy
 msgid "/_View/_Go to/---"
 msgstr "/_Pregled/_Znakovni standard/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 #, fuzzy
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Održavanje/Idi pre_ma/Prethodna _nepročitana poruka"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 #, fuzzy
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Održavanje/Idi pre_ma/_Slijedeća nepročitana poruka"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 #, fuzzy
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Održavanje/Idi pre_ma/_Prethodna poruka"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 #, fuzzy
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Održavanje/Idi pre_ma/Slij_edeća poruka"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 #, fuzzy
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Održavanje/P_rethodna označena poruka"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 #, fuzzy
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Održavanje/Idi pre_ma/Slijedeća _označena poruka"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 #, fuzzy
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Održavanje/Idi pre_ma/Pre_thodna label poruka"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 #, fuzzy
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Održavanje/Idi pre_ma/Slijedeća _label poruka"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 #, fuzzy
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Europa (ISO-8859-_1)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 #, fuzzy
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Pošta/Primi poštu sa _svih računa"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Pošta/Primi poštu sa _svih računa"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:755
 #, fuzzy
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Poruka/Pošalji _kasnije"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 #, fuzzy
 msgid "/_Message/_Send queued messages"
 msgstr "/_Pošta/Pošalji _odložene poruke"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Pošta/Kreiraj _novu poruku"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Pošta/O_dgovori"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 #, fuzzy
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 #, fuzzy
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 #, fuzzy
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Pošta/Od_govori pošiljatelju"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 #, fuzzy
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Pošta/Odgovori svi_ma"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Pošta/P_roslijedi"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 #, fuzzy
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Pošta/Proslijedi _kao prilog"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 #, fuzzy
 msgid "/_Message/Redirec_t"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Pošta/Prem_jesti..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Pošta/Kopir_aj"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Pošta/O_znači"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Pošta/O_znači/_Označi"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Pošta/O_znači/_Ukloni oznaku"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Pošta/O_znači/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Pošta/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Pošta/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Pošta/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Pošta/O_znači/Označi sve _pročitano"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Pošta/O_briši"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Pošta/Primi novu _poštu"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Pošta/Primi novu _poštu"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Pošta/Pre_Uredi"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 #, fuzzy
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 #, fuzzy
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 #, fuzzy
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 #, fuzzy
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Održavanje/_Obriši duplicirane poruke"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Izvršava označene procese"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 #, fuzzy
 msgid "/_Tools/_Log window"
 msgstr "/_Alat/Zapisni prozor"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_običajene postavke..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Obrazac..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 #, fuzzy
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Uredi račune..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni račun..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Kreiraj _novi račun..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Uredi račune..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promjeni _trenutni račun"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 #, fuzzy
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_O"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 #, fuzzy
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 #, fuzzy
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 #, fuzzy
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr ""
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 #, fuzzy
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Kreiram glavne prozore...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr ""
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Dodaj sandučić"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3753,16 +3753,16 @@ msgstr ""
 "Ako je unešen postojeći sandučić, biti će\n"
 "automatski pretražen."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3771,74 +3771,74 @@ msgstr ""
 "Kreiranje sandučića propalo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr ""
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Od_govori"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovara svima"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor_i pošiljatelju"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 #, fuzzy
 msgid "Command line options"
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3854,7 +3854,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4079,7 +4079,7 @@ msgstr "Račun%d"
 msgid "Preferences for new account"
 msgstr "Postavke za novi račun"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Postavke računa"
 
@@ -4092,7 +4092,7 @@ msgid "Receive"
 msgstr "Primanje"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Pošalji"
 
@@ -4315,7 +4315,7 @@ msgstr "Autoriziraj s POP3 prije slanja"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Potpis"
 
@@ -4771,7 +4771,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Uređivač"
 
@@ -5934,7 +5934,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
@@ -6152,83 +6152,93 @@ msgstr "Ispiši"
 msgid "Print message"
 msgstr "Pošalji poruku"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Korak"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Poslužitelj za primanje"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Izvršava označene procese"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Postav"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 #, fuzzy
 msgid "Common preferences"
 msgstr "Uobičajene postavke"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Odloži u spis odloženo i pošalji kasnije"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Spremi u spis nedovršeno"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Priloži"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Priloži datoteku"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 #, fuzzy
 msgid "Append signature"
 msgstr "LOŠ potpis"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Uredi s vanjskim uređivačem"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 #, fuzzy
 msgid "Wrap all long lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Održavanje/_Idi u drugi spis..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6488,7 +6498,7 @@ msgstr "Nema potpisa"
 msgid "Good signature from \"%s\""
 msgstr "Dobar potpis od \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Dobar potpis"
 
@@ -6497,7 +6507,7 @@ msgstr "Dobar potpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6534,7 +6544,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "LOŠ potpis od \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "LOŠ potpis"
 
@@ -7004,46 +7014,50 @@ msgstr "datoteka %s već postoji\n"
 msgid "Creating text view...\n"
 msgstr "Kreiram pregled teksta...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "poruka neće biti primljena\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/S_premi kao"
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Uobičajene adrese"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr ""
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -7052,7 +7066,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 53e40cbf..1581e591 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,12 +3,11 @@
 # Székely Kriszitán <szekelyk@different.hu>, 2001.
 # Zahemszky Gábor <Gabor@Zahemszky.HU>, 2002, 2003, 2004.
 # Németh Tamás <ntomasz@vipmail.hu>, 2005, 2006, 2007.
-
 msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2007-02-17 19:22+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: HUNGARIAN <NONE>\n"
@@ -53,161 +52,161 @@ msgstr "Levelek hozzáfűzése ide: %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "%s levél áthelyezése ide: %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "%s levél másolása ide: %s ..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "%s levél eltávolítása"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nem lehet beállítani a törölt jelzést: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "nem lehet törölni\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Minden levél törlése ebből: %s?"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nem lehet beállítani a törölt jelzést: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "mappa bezárása nem sikerült\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s gyökérmappa nem létezik\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "hiba történt a LIST lekérdezése közben.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s' nem hozható létre\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, 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:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nem lehet létrehozni postaládát: LIST sikertelen\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "nem lehet létrehozni postaládát\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, 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:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "nem lehet törölni a postaládát\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "a borítékot nem lehet megszerezni\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Levélfejlécek letöltése (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "hiba történt a boríték fogadása közben.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nem lehet értelmezni a borítékot: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, 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:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "névtér nem elérhető\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "%s mappát nem lehet kiválasztani\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "hiba az IMAP parancs közben: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "Az IMAP4 azonosítás nem sikerült.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 bejelentkezés sikertelen.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s nem fűzhető hozzá ehhez: %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(fájl küldése...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "levél nem fűzhető hozzá ehhez: %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s nem másolható ide: %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, 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:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "hiba az IMAP parancs közben: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "hiba az IMAP parancs közben: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, 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:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "az iconv nem tudja UTF-7-re konvertálni ezt: %s\n"
@@ -299,20 +298,20 @@ msgstr "Levelek exportálása innen: %s ide: %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "%s levél nem másolható ide: %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "A jelölő fájlt nem lehet megnyitni.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "A forrás- és célmappa azonos.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "%s%c%d levél másolása ide: %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -321,7 +320,7 @@ msgstr ""
 "`%s' fájl már létezik.\n"
 "Mappa nem hozható létre."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -596,12 +595,12 @@ msgstr "  Tárgy: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Szerző: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "fájl módja nem változtatható\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s fájlba nem sikerült írni.\n"
@@ -687,7 +686,7 @@ msgstr ""
 "funkció bekapcsolásához tegyen pipát a 'G' oszlopban levő négyzetbe!"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -823,7 +822,7 @@ 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:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Cím"
 
@@ -836,7 +835,7 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fájl"
@@ -858,9 +857,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Fájl/Új _LDAP Szerver"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Fájl/---"
@@ -882,11 +881,11 @@ msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Szerkesztés"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Szerkesztés/_Másolás"
@@ -923,7 +922,7 @@ msgstr "/_Cím/_Szerkesztés"
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Eszközök"
@@ -932,12 +931,12 @@ msgstr "/_Eszközök"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl importálása"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
@@ -982,7 +981,7 @@ msgstr "/_Beillesztés"
 msgid "E-Mail address"
 msgstr "Email cím"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Címjegyzék"
 
@@ -1046,7 +1045,7 @@ msgstr ""
 "Tényleg törölni szeretné a(z) `%s' mappát ÉS az összes címet benne?\n"
 "Ha csak a mappát törli, a címek átkerülnek a szülő mappába."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
@@ -1200,15 +1199,15 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Megjegyzés"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Hiba"
 
@@ -1308,7 +1307,7 @@ msgstr "/_Szerkesztés/_Visszavonás"
 msgid "/_Edit/_Redo"
 msgstr "/_Szerkesztés/_Ismétlés"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Szerkesztés/---"
@@ -1321,7 +1320,7 @@ msgstr "/_Szerkesztés/_Kivágás"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Szerkesztés/_Beillesztés idézetként"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Szerkesztés/Mindet kijelöli"
 
@@ -1337,7 +1336,7 @@ msgstr "/_Szerkesztés/Minden hosszú _sor törése"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Szerkesztés/A_utomata tördelés"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Nézet"
@@ -1359,9 +1358,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Nézet/_Válasz"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Nézet/---"
 
@@ -1381,7 +1380,7 @@ msgstr "/_Nézet/_Csatolás"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Nézet/Eszközs_áv testreszabása..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Nézet/_Karakterkódolás"
 
@@ -1392,112 +1391,112 @@ msgstr "/_Nézet/_Karakterkódolás/_Automatikus"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Nézet/_Karakterkódolás/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Nézet/_Karakterkódolás/7 bites ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Nézet/_Karakterkódolás/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 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:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Nézet/_Karakterkódolás/_Baltikumi (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Nézet/_Karakterkódolás/Baltikumi (Windows-1257)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Nézet/_Karakterkódolás/Görög (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Nézet/_Karakterkódolás/Arab (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Nézet/_Karakterkódolás/Arab (Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Nézet/_Karakterkódolás/Héber (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Nézet/_Karakterkódolás/Török (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (KOI8-_U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Nézet/_Karakterkódolás/Cirill (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Nézet/_Karakterkódolás/Egyszerűsített Kínai (GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Nézet/_Karakterkódolás/Thai (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Eszközök/_Címjegyzék"
 
@@ -1505,13 +1504,13 @@ msgstr "/_Eszközök/_Címjegyzék"
 msgid "/_Tools/_Template"
 msgstr "/_Eszközök/_Sablon"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Eszközök/_Műveletek"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Eszközök/---"
@@ -1545,70 +1544,70 @@ msgstr "%s: fájl nem létezik\n"
 msgid "Can't get text part\n"
 msgstr "Nem tudtam olvasni a szövegrészt\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Idézet jelölés formátum hiba."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Levél válasz/továbbítás formátumhiba."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s fájl nem létezik\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s mérete nem határozható meg\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "A(z) %s fájl üres."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "%s nem olvasható."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Levél: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 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:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Levél írása%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Nincs címzett megadva."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Nincs tárgy"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "A levél tárgya üres. Ennek ellenére elküldi?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "címzett lista nem hozzáférhető."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1616,22 +1615,22 @@ msgstr ""
 "Nincs megadva hozzáférés a levél küldéshez.\n"
 "Válasszon ki egy hozzáférést küldés előtt!"
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Hiba lépett fel a %s-nak/nek küldendő levél küldésekor."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "A levél nem menthető a kimenő mappába."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Nem találtam hozzárendelt kulcsot a kiválasztott kulcs azonosítóhoz `%s'."
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1642,11 +1641,11 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi, mint %s?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Kód konvertálási hiba"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1659,15 +1658,15 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Sorhossz határ"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr "Titkos másolat(ok) titkosítása"
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1682,83 +1681,83 @@ msgstr ""
 "\n"
 "Ennek ellenére elküldi?"
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "a régi levelet nem lehet törölni\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "levél Várakozó sorba rakása...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "nem található a Várakozó sor mappája\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "A levelet nem sikerült a Várakozó sorba rakni\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generált Message-ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Szerkesztőablak létrehozása...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "PGP Aláírás"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "MIME típus"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Méret"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1767,48 +1766,48 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr "Eszközs_áv testreszabása..."
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "A levelet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Levél mentése"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 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:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -1965,12 +1964,12 @@ msgstr "Mappa szerkesztése"
 msgid "Input the new name of folder:"
 msgstr "A mappa új neve:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Új mappa"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Az új mappa neve:"
 
@@ -2137,42 +2136,42 @@ msgstr "Könyvtár választása"
 msgid "Select folder"
 msgstr "Mappa választása"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Bejövő"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Kimenő"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Várakozó"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Vázlatok"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "Új mappa"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' nem tehető a mappanévbe."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' mappa már létezik."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' nem hozható létre."
@@ -2259,56 +2258,56 @@ msgstr "Mappa információ beállítása...\n"
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Mappafa újraépítése"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A mappafa újra fog épülni. Folytatja?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Mappafa újraépítése..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Mappafa újraépítése sikertelen."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Új levelek keresése minden mappában..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Levélszemét"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s mappa kiválasztva\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Levelek letöltése a(z) %s mappába ..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hiba lépett fel a(z) %s mappába történő levelek letöltésekor."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2318,26 +2317,26 @@ msgstr ""
 "(Ha egy almappákat tartalmazó mappát szeretne létrehozni,\n"
 "akkor tegyen egy `/' jelet a név végére)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Adja meg `%s' új nevét:"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Mappa átnevezése"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' mappa nem nevezhető át."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' mappa nem helyezhető át."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2346,11 +2345,11 @@ msgstr ""
 "A(z) `%s' keresési mappa törlése?\n"
 "Az eredeti levelek nem törlődnek."
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Keresési mappa törlése"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2363,20 +2362,20 @@ msgstr ""
 "\n"
 "Biztosan törölni szeretné?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' mappa nem távolítható el."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Minden levél törlése a kukából?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2385,34 +2384,34 @@ msgstr ""
 "Tényleg eltávolítja `%s' postaládát?\n"
 "(A levelek NEM törlődnek a meghajtóról)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Postaláda eltávolítása"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Tényleg törli a(z) `%s' IMAP4 hozzáférést?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hozzáférés törlése"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírcsoportot?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Hírcsoport törlése"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírhozzáférést?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Hírhozzáférés törlése"
 
@@ -2558,142 +2557,142 @@ msgstr "Vége"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d új levél"
 
-#: src/inc.c:478
+#: src/inc.c:481
 msgid "Authenticating with POP3"
 msgstr "POP3 azonosítás"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Új levelek fogadása"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Készenlét"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Megszakítva"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Fogadás"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Kész (%d levél (%s) fogadott)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Kész (nincs új levél)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Kapcsolat megszakadt"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Azonosítás nem sikerült"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Zárolt"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Időtúllépés"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Vége (%d új levél)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Vége (nincs új levél)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Hiba történt a levelek fogadásakor."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s hozzáférésről az új levelek letöltése...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: POP3 azonosítás"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Új levelek fogadása"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Kapcsolódás a(z) %s POP3 szerverhez ..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nem sikerült kapcsolódni a POP3 szerverhez: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Azonosítás..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Levelek fogadása innen: %s ..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Új levelek számának megszerzése (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Új levelek számának megszerzése (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Új levelek számának megszerzése (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Új levelek méretének megszerzése (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d levél törlése"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Kilépés"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Levél letöltése (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Levelek fogadása (%d levél (%s) fogadott)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Kapcsolat megszakadt."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Hiba a levelek feldolgozása közben."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2702,28 +2701,28 @@ msgstr ""
 "Hiba a levelek feldolgozása közben:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Nincs több szabad hely a lemezen."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Nem lehet a fájlba írni."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Socket hiba."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "A távoli fél bezárta a kapcsolatot."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "A postafiók zárolt."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2732,11 +2731,11 @@ msgstr ""
 "A postafiók zárolt:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Az azonosítás nem sikerült."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2745,15 +2744,15 @@ msgstr ""
 "Az azonosítás nem sikerült:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Menet időtúllépése."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Fogadás megszakítva\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s új leveleinek letöltése a(z) %s mappába...\n"
@@ -2884,7 +2883,7 @@ msgstr "Várakozó levelek"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vannak elküldetlen levelek. Kilépés most?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2893,15 +2892,15 @@ msgstr ""
 "OpenPGP támogatás kikapcsolva."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "Egy másik Sylpheed már fut.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Beállítások migrálása"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2909,651 +2908,652 @@ msgstr ""
 "Az előző verzió konfigurációja megtalálva.\n"
 "Szeretné migrálni azokat?"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Fájl/_Mappa"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fájl/_Mappa/Ú_j mappa létrehozása..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fájl/_Mappa/Mappa át_nevezése..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fájl/_Mappa/Mappa át_helyezése..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fájl/_Mappa/Mappa _törlése"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Fájl/_Postaláda"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fájl/_Postaláda/Postaláda _hozzáadása..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fájl/_Postaláda/Postaláda _eltávolítása"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fájl/_Postaláda/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fájl/_Postaláda/Ú_j levelek ellenőrzése"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 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:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fájl/_Postaláda/_Mappafa újraépítése"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fájl/Mbox fájl _importálása..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fájl/Mbox fájl _exportálása..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Fájl/_Kuka ürítése"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Fájl/_Mentés másként..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 msgid "/_File/Page set_up..."
 msgstr "/_Fájl/_Oldalbeállítás..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Fájl/_Nyomtatás..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 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:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Fájl/Ki_lépés"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Szerkesztés/S_zál kiválasztása"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Szerkesztés/_Keresés az aktuális levélben..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Szerkesztés/Le_velek keresése..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Nézet/_Megjelenít vagy elrejt"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/Mappa_fa"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Levélnézet"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 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:570
+#: src/mainwindow.c:572
 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:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Ikon"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/_Szöveg"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Eszközsáv/Se_mmi"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/_Keresősáv"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Nézet/_Megjelenít vagy elrejt/Á_llapotsáv"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Nézet/Eszközs_áv testreszabása..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Nézet/_Külön mappafa"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/_Nézet/Külön le_vélnézet"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Nézet/_Rendezés"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Nézet/_Rendezés/_Szám szerint"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Nézet/_Rendezés/_Méret szerint"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Nézet/_Rendezés/_Dátum szerint"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Nézet/_Rendezés/_Szál dátuma szerint"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Nézet/_Rendezés/_Feladó szerint"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Nézet/_Rendezés/_Címzett szerint"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Nézet/_Rendezés/_Tárgy szerint"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Nézet/_Rendezés/S_zínes címke szerint"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Nézet/_Rendezés/_Jelölés szerint"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Nézet/_Rendezés/_Olvasatlan szerint"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Nézet/_Rendezés/Cs_atolás szerint"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Nézet/_Rendezés/Nem _rendez"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Nézet/_Rendez/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Nézet/_Rendezés/_Növekvő"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Nézet/_Rendezés/_Csökkenő"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Nézet/_Rendezés/_Tárgyhoz vonz"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Nézet/Szá_lankénti nézet"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Nézet/_Minden szál kifejtése"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Nézet/_Minden szál bezárása"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Nézet/K_ijelzett cikk beállítás..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Nézet/_Ugrás"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Nézet/_Ugrás/_Előző levélhez"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Nézet/_Ugrás/_Következő levélhez"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Nézet/_Ugrás/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Nézet/_Ugrás/_Előző olvasatlan levélhez"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Nézet/_Ugrás/_Következő olvasatlan levélhez"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Nézet/_Ugrás/_Előző új levélhez"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Nézet/_Ugrás/_Következő új levélhez"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Nézet/_Ugrás/_Előző megjelölt levélhez"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Nézet/_Ugrás/_Következő megjelölt levélhez"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Nézet/_Ugrás/_Előző címkézett levélhez"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Nézet/_Ugrás/_Következő címkézett levélhez"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Nézet/_Ugrás/_Másik _mappához"
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus felismerés"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Nézet/_Karakterkódolás/Japán (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Nézet/_Karakterkódolás/Tradicionális Kínai (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Nézet/_Karakterkódolás/Kínai (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Nézet/Me_gnyitás új ablakban"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Nézet/Ü_zenet forrása"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/_Nézet/_Összes fejléc"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Nézet/Ö_sszegzés frissítése"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Levél"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/_Levél/Fog_adás"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Levél/Fog_adás/_Aktuális hozzáférésről"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Levél/Fog_adás/_Minden hozzáférésről"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Levél/Fo_gadás/Fogadás me_gszakítása"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Levél/Fog_adás/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Levél/Le_velek küldése a Várakozó sorból"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Levél/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Levél/_Új levél szerkesztése"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Levél/Vá_lasz"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Levél/_Válasz másnak"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Levél/Válasz _másnak/_Mindenkinek"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Levél/Válasz _másnak/A _küldőnek"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Levél/Válasz _másnak/_Levelező listának"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Levél/_Továbbítás"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Levél/Továbbítás _csatolásként"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Levél/Á_tirányít"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Levél/M_ozgatás..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Levél/_Másolás..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Levél/_Megjelöl"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Levél/_Megjelöl/_Megjelöl"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Levél/_Megjelöl/Megjelölés visszavonása"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Levél/_Megjelöl/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Levél/_Megjelöl/Mint olvasatla_n"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Levél/_Megjelöl/Mint olvaso_tt"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Levél/_Megjelöl/Mint olvasott _szál"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Levél/_Megjelöl/_Minden olvasottat"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Levél/_Törlés"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Levél/_Levélszemétként beállítás"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Levél/_Nem levélszemétként beállítás"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Levél/_Újraszerkesztés"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 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:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Eszközök/Összes levél szűrése a mappában"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Eszközök/Kivá_lasztott levelek szűrése"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Eszközök/_Szűrési szabályok"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Eszközök/_Szűrési szabályok/_Automatikusan"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Eszközök/_Szűrési szabályok/_Feladó alapján"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Eszközök/_Szűrési szabályok/_Címzett alapján"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Eszközök/_Szűrési szabályok/_Tárgy alapján"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Eszközök/Levélszemét szűrése a mappában"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Eszközök/Kiválasztott levelek szűrése levélsze_métre"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Eszközök/_Duplikált levelek törlése"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Eszközök/Megjelölt _processz futtatása"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Eszközök/_Napló ablak"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Beállítások"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Beállítások/Általános _beállítások..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Beállítások/_Szűrő beállítások..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Beállítások/_Sablonok..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Beállítások/Mű_veletek..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Beállítások/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Beállítások/Aktuális _hozzáférés beállításai..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Beállítások/_Új hozzáférés létrehozása..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Beállítások/Hozzáférések _szerkesztése..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Beállítások/_Aktuális hozzáférés váltása..."
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/Sú_gó/_Kézikönyv"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/Sú_gó/Kézikönyv/_Angol"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Sú_gó/Kézikönyv/_Japán"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/Sú_gó/_GYIK"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/Sú_gó/_GYIK/_Angol"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/Sú_gó/_GYIK/_Német"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Sú_gó/_GYIK/_Spanyol"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/Sú_gó/_GYIK/_Francia"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Sú_gó/_GYIK/_Olasz"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/Sú_gó/Para_ncssor opciói"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/Sú_gó/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Főablak létrehozása...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "kész.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Névtelen"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "semmi"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Ablak elválasztás típus változtatása %d-ról, %d-ra\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Kapcsolat nélkül"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Ön kapcsolat nélküli módban van. Kapcsolódik?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Kuka ürítése"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Minden levél törlése a kukából?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Postaláda hozzáadása"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3563,16 +3563,16 @@ msgstr ""
 "Ha létező postaládát ad meg, akkor\n"
 "automatikusan átvizsgálom."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A(z) `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3581,68 +3581,68 @@ msgstr ""
 "A postaláda létrehozása nem sikerült.\n"
 "Talán néhány fájl már létezik, vagy nincs írási jogod."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappanézet"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Levélnézet"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Válasz"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "Válasz _mindenkinek"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Válasz a _küldőnek"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Válasz a _levelezőlistának"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Csatoláské_nt továbbít"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 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:2837
+#: src/mainwindow.c:2849
 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:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Kilépés a programból?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Parancssori opciók"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Használat: sylpheed [OPCIÓ]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3670,7 +3670,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3905,7 +3905,7 @@ msgstr "Hozzáférés%d"
 msgid "Preferences for new account"
 msgstr "Új hozzáférés beállításai"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Hozzáférés beállítások"
 
@@ -3918,7 +3918,7 @@ msgid "Receive"
 msgstr "Fogadás"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Küldés"
 
@@ -4130,7 +4130,7 @@ msgstr "Azonosítás küldés előtt POP3-mal"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Aláírás"
 
@@ -4590,7 +4590,7 @@ msgstr "A saját levélre válaszkor öröklött címzettek"
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Szerkesztő"
 
@@ -5689,7 +5689,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Válasz esetén törölje a [...] vagy (...) szöveget a tárgy mezőből"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hozzáférés"
 
@@ -5895,79 +5895,89 @@ msgstr "Nyomtatás"
 msgid "Print message"
 msgstr "Levél nyomtatása"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Lépés"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Szerver a fogadáshoz"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Futtatás"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Megjelölt processz futtatása"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Beállítások"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Közös beállítások"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Levél küldése"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Küldés később"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Levél a Várakozó sorba, küldés később"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Vázlat"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Mentés a vázlat mappába"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Beszúrás"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Fájl beszúrása"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Csatolás"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Fájl csatolása"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Aláírás csatolása"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Szerkesztés külső programmal"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Sortörés"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Az összes hosszú sor törése"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 msgid "Customize toolbar"
 msgstr "Eszközsáv testreszabása"
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
 "the order by using the Up / Down button."
@@ -6218,7 +6228,7 @@ msgstr "Nem található digitális aláírás"
 msgid "Good signature from \"%s\""
 msgstr "Jó digitális aláírás \"%s\"-tól/től"
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Jó digitális aláírás"
 
@@ -6227,7 +6237,7 @@ msgstr "Jó digitális aláírás"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Érvényes aláírás, de a(z) \"%s\" kulcs nem megbízható"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Érvényes aláírás (megbízhatatlan kulcs)"
 
@@ -6263,7 +6273,7 @@ msgstr "Érvényes aláírás, de az aláíró kulcs vissza lett vonva"
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ digitális aláírás \"%s\"-tól/től"
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "ROSSZ digitális aláírás"
 
@@ -6716,11 +6726,15 @@ msgstr "%s fájl már létezik\n"
 msgid "Creating text view...\n"
 msgstr "Szövegnézet létrehozása...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Ez a levél nem jeleníthető meg.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -6728,31 +6742,31 @@ msgstr ""
 "A szövegtest nem jeleníthető meg, mert az ideiglenes fájl írása nem "
 "sikerült.\n"
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "A kép me_ntése mint..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Ú_j levél írása"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Hozzáadás a _címjegyzékhez..."
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "A cí_m másolása"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "M_egnyitás webböngészővel"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "A _hivatkozás másolása"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6764,7 +6778,7 @@ msgstr ""
 "látható URL-től (%s).\n"
 "Ennek ellenére megnyitja?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Hamis URL figyelmeztetés"
 
diff --git a/po/it.po b/po/it.po
index 4018bdae..86e33c67 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.2.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2006-10-14 11:32+0200\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -52,161 +52,161 @@ msgstr "Aggiunta di messaggi in %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "Spostamento dei messaggi da %s in %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copia dei messaggi da %s in %s ..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Rimozione messaggi %s"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "impossibile impostare i flag eliminati: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "impossibile cancellare\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Rimozione di tutti i messaggi in %s"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "impossibile impostare i flag eliminati: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "impossibile chiudere la cartella\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "la cartella radice %s non esiste\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "si è verificato un errore durante la ricezione di LIST.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Impossibile creare «%s»\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Impossibile creare «%s» sotto IN ENTRATA\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "impossibile creare la casella postale: LIST fallito\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "impossibile creare la casella postale\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossibile rinominare la casella postale: %s in %s\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "impossibile eliminare la casella postale\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "impossibile ricevere la busta\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Ricezione intestazioni del messaggio (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "si è verificato un errore durante la ricezione della busta.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "impossibile analizzare la busta: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossibile connettersi al server IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "impossibile ricevere il namespace\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "impossibile selezionare la cartella: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "errore durante il comando imap: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autenticazione IMAP4 fallita.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "Login IMAP4 fallito.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "impossibile aggiungere %s a %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(spedizione del file...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossibile aggiungere a %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossibile copiare %s in %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "errore durante il comando imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "errore durante il comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "errore durante il comando imap: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non può convertire UTF-7 in %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non può convertire %s in UTF-7\n"
@@ -298,20 +298,20 @@ msgstr "Esportazione dei messaggi da %s in %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "impossibile copiare il messaggio %s in %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "impossibile aprire il file delle segnature.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "la cartella sorgente é identica a quella di destinazione.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copia del messaggio %s%c%d in %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -320,7 +320,7 @@ msgstr ""
 "Il file «%s» esiste già.\n"
 "Impossibile creare la cartella."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -595,12 +595,12 @@ msgstr "  Oggetto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Distributore: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "impossibile cambiare i permessi del file\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "la scrittura su %s è fallita.\n"
@@ -686,7 +686,7 @@ msgstr ""
 "tutti»."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -821,7 +821,7 @@ msgstr "Argomento dell'azione utente"
 msgid "Add Address to Book"
 msgstr "Aggiunta dell'indirizzo alla rubrica"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Indirizzo"
 
@@ -834,7 +834,7 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_File"
@@ -856,9 +856,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_File/Nuovo server _LDAP"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_File/---"
@@ -880,11 +880,11 @@ msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
@@ -921,7 +921,7 @@ msgstr "/_Indirizzo/_Modifica"
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/S_trumenti"
@@ -930,12 +930,12 @@ msgstr "/S_trumenti"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
@@ -982,7 +982,7 @@ msgstr "/_Modifica/_Incolla"
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Rubrica"
 
@@ -1048,7 +1048,7 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
@@ -1206,15 +1206,15 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Avviso"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Errore"
 
@@ -1314,7 +1314,7 @@ msgstr "/_Modifica/_Annulla"
 msgid "/_Edit/_Redo"
 msgstr "/_Modifica/_Ripeti"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Modifica/---"
@@ -1327,7 +1327,7 @@ msgstr "/_Modifica/_Taglia"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Modifica/Incolla co_me citazione"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Modifica/_Seleziona tutto"
 
@@ -1343,7 +1343,7 @@ msgstr "/_Modifica/A capo tutte le righe _lunghe"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A cap_o automatico"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Visualizza"
@@ -1365,9 +1365,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Visualizza/_Rispondi a"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
 
@@ -1388,7 +1388,7 @@ msgstr "/_Visualizza/Alle_gato"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Visualizza/V_ai a/Cartella di_fferente..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Visualizza/Co_difica caratteri"
 
@@ -1399,112 +1399,112 @@ msgstr "/_Visualizza/Co_difica caratteri/_Automatica"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visualizza/Co_difica·caratteri/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visualizza/Co_difica·caratteri/ASCII a 7 bit (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visualizza/Co_difica caratteri/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (IS_O-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Centrale (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (I_SO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Visualizza/Co_difica caratteri/Baltico (Windows-1257)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visualizza/Co_difica caratteri/Greco (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Visualizza/Co_difica caratteri/Arabo (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Visualizza/Co_difica caratteri/Arabo (_Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visualizza/Co_difica caratteri/Ebreo (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visualizza/Co_difica caratteri/Turco (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visualizza/Co_difica caratteri/Ciri_llico (KOI8-U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visualizza/Co_difica caratteri/Cirillico (_Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese semplificato (GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Coreano (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailandese (TIS-_620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visualizza/Co_difica caratteri/Tailan_dese (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/S_trumenti/_Rubrica"
 
@@ -1512,13 +1512,13 @@ msgstr "/S_trumenti/_Rubrica"
 msgid "/_Tools/_Template"
 msgstr "/S_trumenti/_Modello"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/S_trumenti/A_zioni"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/S_trumenti/---"
@@ -1552,70 +1552,70 @@ msgstr "%s: il file non esiste\n"
 msgid "Can't get text part\n"
 msgstr "Impossibile ricevere parte del testo\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Errore del formato del segno di citazione."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Errore del formato nel messaggio di risposta/inoltro."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Il file %s non esiste\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Impossibile ottenere la dimensione di %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Impossibile leggere %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Componi%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Il destinatario non è specificato."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Oggetto vuoto"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'oggetto è vuoto. Inviarlo comunque?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "impossibile ottenere la lista dei destinatari."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1623,23 +1623,23 @@ msgstr ""
 "Non è specificato l'account per l'invio della posta.\n"
 "Scegliere un account di posta prima dell'invio."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Si è verificato un errore durante l'invio del messaggio a %s ."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Impossibile salvare il messaggio nella cartella «Inviata»."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1651,11 +1651,11 @@ msgstr ""
 "\n"
 "Spedirlo come %s comunque?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Errore di conversione del codice"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1669,15 +1669,15 @@ msgstr ""
 "\n"
 "Spedirlo comunque?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Limite lunghezza linea"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr "Cifratura con Bcc"
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1691,83 +1691,83 @@ msgstr ""
 "\n"
 "Inviarlo comunque?"
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "impossibile rimuovere il vecchio messaggio\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "accodamento messaggio...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "impossibile trovare la cartella «Coda»\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "impossibile accodare il messaggio\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generato l'ID-messaggio: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Creazione della finestra di composizione...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "Firma PGP"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, 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:5724
+#: src/compose.c:5732
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1776,48 +1776,48 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -1975,12 +1975,12 @@ msgstr "Modifica la cartella"
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -2148,42 +2148,42 @@ msgstr "Selezione directory"
 msgid "Select folder"
 msgstr "Selezione della cartella"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "In entrata"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Inviata"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Coda"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Cestino"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "Nuova cartella"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "«%c» non può essere incluso nel nome della cartella."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La cartella «%s» esiste già."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossibile creare la cartella «%s»."
@@ -2270,56 +2270,56 @@ msgstr "Impostazione delle informazioni della cartella...\n"
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Ricostruisco l'albero della cartella"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'albero della cartella sarà ricostruito. Continuo?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Sto ricostruendo l'albero della cartella..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "La ricostruzione delll'albero della cartella è fallita."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Spazzatura"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "La cartella %s è selezionata\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sto scaricando i messaggi in %s ..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Si è verificato un errore scaricando i messaggi in «%s»."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2329,26 +2329,26 @@ msgstr ""
 "(se si vuole creare una catella per memorizzare sottocartelle,\n"
 " aggiungere «/» alla fine del nome)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Inserire il nuovo nome per «%s»:"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Rinomina la cartella"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossibile rinominare la cartella «%s»."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossibile spostare la cartella «%s»."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2357,11 +2357,11 @@ msgstr ""
 "Rimuovere la cartella di ricerca «%s» ?\n"
 "I messaggi reali non saranno eliminati."
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Elimina la cartella di ricerca"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2375,20 +2375,20 @@ msgstr ""
 "\n"
 "Eliminare?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossibile rimuovere la cartella «%s»."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2397,34 +2397,34 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 «%s»?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup «%s» ?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news «%s» ?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
@@ -2570,143 +2570,143 @@ msgstr "Fine"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nuovi messaggi"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autenticazione"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Recupero i nuovi messaggi"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Attesa"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Cancellato"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Recupero"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Fatto (ricevuti %d messaggio(i) (%s))"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Fatto (non ci sono nuovi messaggi)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Autenticazione fallita"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Bloccato"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Timeout"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finito (%d nuovo(i) messaggio(i))"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Finito (non ci sono nuovi messaggi)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Ci sono stati degli errori durante la ricezione della posta."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "ricezione dei nuovi messaggi dell'account %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autenticazione"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recupero i nuovi messaggi"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connessione al server POP3: %s..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossibile connettersi al server POP3: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Autenticazione..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Ricezione dei messaggi da %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ricezione del numero dei nuovi messaggi (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ricezione del numero dei nuovi messaggi (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ricezione del numero dei nuovi messaggi (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ricezione della dimensione dei messaggi (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Eliminazione del messaggio %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Esco"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recupero il messaggio (%d di %d) (%s di %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ricezione di (%d messaggio(i) ricevuti (%s))"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Connessione fallita."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Si è verificato un errore durante l'elaborazione della posta."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2715,28 +2715,28 @@ msgstr ""
 "Si è verificato un errore durante l'elaborazione della posta:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Spazio su disco esaurito."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Impossibile scrivere il file."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Errore del socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Connessione chiusa dall'host remoto."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "La casella postale è bloccata."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2745,11 +2745,11 @@ msgstr ""
 "La casella postale è bloccata:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2758,15 +2758,15 @@ msgstr ""
 "Autenticazione fallita:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "La sessione è andata in timeout."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Incorporazione cancellata\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Ricezione in %s dei nuovi messaggi da %s...\n"
@@ -2898,7 +2898,7 @@ msgstr "Messaggi accodati"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ci sono messaggi non spediti in «Coda». Uscire ora ?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2907,15 +2907,15 @@ msgstr ""
 "Il supporto per OpenPGP è disabilitato."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "un altro Sylpheed è già in esecuzione.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Migrazione della configurazione"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2923,655 +2923,656 @@ msgstr ""
 "È stata trovata una versione precedente della configurazione.\n"
 "Trasferirla?"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_File/Ca_rtella"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_File/Ca_rtella/Crea _nuova cartella..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_File/Ca_rtella/_Rinomina cartella..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_File/Ca_rtella/_Sposta cartella..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_File/Ca_rtella/Eli_mina cartella"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_File/_Casella postale"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_File/_Casella postale/_Aggiungi casella postale..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_File/_Casella postale/Rimuovi ca_sella postale"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_File/_Casella postale/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_File/_Casella postale/_Controllo nuovi messaggi"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_File/_Casella postale/Controllo nuovi _messaggi in tutte le cartelle"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_File/_Casella postale/R_icostruisci l'albero cartella"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_File/_Importa file mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_File/Esp_orta file mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_File/S_vuota cestino"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_File/Sa_lva come..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_File/Sa_lva come..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_File/Stam_pa..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_File/Lavora offli_ne"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_File/_Esci"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Modifica/Seleziona t_hread"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Modifica/_Trova nel messaggio attuale..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Modifica/Ricerca _messaggi..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Visualizza/Mostra o _nascondi"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Visualizza/Mostra o _nascondi/A_lbero cartella"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Visualizza/Mostra o _nascondi/Vista _messaggio"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/Icone _e testo"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/I_cone"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/I_cone"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/_Testo"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra degli _strumenti/_Niente"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Visualizza/Mostra o _nascondi/_Barra di ricerca"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra di s_tato"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Visualizza/V_ai a/Cartella di_fferente..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visualizza/Albero _cartella separato"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/_Visualizza/Vista m_essaggio separata"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Visualizza/_Ordina"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visualizza/_Ordina/per n_umero"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Visualizza/_Ordina/per dim_ensione"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Visualizza/_Ordina/per _data"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Visualizza/_Ordina/pe_r data del thread"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Visualizza/_Ordina/per _mittente"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Visualizza/_Ordina/per dest_inatario"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Visualizza/_Ordina/per _oggetto"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visualizza/_Ordina/per colore etic_hetta"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visualizza/_Ordina/per _segno"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Visualizza/_Ordina/per non le_tti"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visualizza/_Ordina/per a_llegato"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visualizza/_Ordina/No_n ordinare"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Visualizza/_Ordina/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Visualizza/_Ordina/_Ascendente"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Visualizza/_Ordina/Dis_cendente"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visualizza/_Ordina/_Raggruppa per oggetto"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Visualizza/Vista _thread"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visualizza/E_spandi tutti i thread"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visualizza/Nascondi tutti i t_hread"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Visualizza/I_mposta voci da visualizzare..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Visualizza/V_ai a"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Visualizza/V_ai a/Messaggio preced_ente"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visualizza/V_ai a/Messaggio successi_vo"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Visualizza/V_ai a/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio non letto p_recedente"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio non _letto successivo"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Visualizza/V_ai a/Messaggio nuovo pre_cedente"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visualizza/V_ai a/Messaggio nu_ovo successivo"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Visualizza/V_ai a/Messaggio _segnato precedente"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visualizza/V_ai a/Messaggio se_gnato successivo"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Visualizza/V_ai a/Messaggio etic_hettato precedente"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visualizza/V_ai a/Messaggio e_tichettato successivo"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visualizza/V_ai a/Cartella di_fferente..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visualizza/Co_difica caratteri/_Autorilevamento"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Visualizza/Co_difica caratteri/Europa Occidentale (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visualizza/Co_difica caratteri/Gia_pponese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visualizza/Co_difica caratteri/Giapponese (S_hift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese tradizionale (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visualizza/Co_difica caratteri/Cinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Corea_no (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Visualizza/Apri nuova _finestra"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Visualizza/Sorgente messagg_io"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/_Visualizza/Tutte le intesta_zioni"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Visualizza/A_ggiorna sommario"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/M_essaggio"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/M_essaggio/Rice_vi"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/M_essaggio/Rice_vi/Ricevi dall'a_ccount attuale"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/M_essaggio/Rice_vi/Ricevi da _tutti gli account"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/M_essaggio/Rice_vi/Cancella in rice_zione"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/M_essaggio/Rice_vi/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/M_essaggio/Invia messa_ggi accodati"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/M_essaggio/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/M_essaggio/Componi _nuovo messaggio"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/M_essaggio/_Rispondi"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/M_essaggio/Rispondi _a"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/M_essaggio/Rispondi _a/_tutti"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/M_essaggio/Rispondi _a/_mittente"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/M_essaggio/Rispondi _a/mailing _list"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/M_essaggio/_Inoltra"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/M_essaggio/Inoltra come a_llegato"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/M_essaggio/Rispe_disci"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/M_essaggio/Sp_osta..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "M_essaggio/_Copia..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/M_essaggio/_Segna"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/M_essaggio/_Segna/Segn_a"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/M_essaggio/_Segna/To_gli segno"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/M_essaggio/_Segna/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/M_essaggio/_Segna/Segna co_me non letto"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/M_essaggio/_Segna/Segna come _letto"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/M_essaggio/_Segna/Segna il _thread come letto"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/M_essaggio/_Segna/Segna come tutti l_etti"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/M_essaggio/Eli_mina"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/M_essaggio/Imposta come mail spa_zzatura"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Messaggio/Im_posta come mail normale"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/M_essaggio/Rimodi_fica"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/S_trumenti/Aggiungi mittente alla ru_brica..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/S_trumenti/_Filtra tutti i messaggi nella cartella"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/S_trumenti/Filtra i messaggi _selezionati"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/S_trumenti/_Crea regola per il filtro"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/S_trumenti/_Crea regola per il filtro/A_utomaticamente"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _Da"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/S_trumenti/_Crea regola per il filtro/con _A"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/S_trumenti/_Crea regola per il filtro/con l'_Oggetto"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/S_trumenti/Filtra le mail s_pazzatura nella cartella"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/S_trumenti/Filtra le _mail spazzatura nei messaggi selezionati"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/S_trumenti/Elimina messaggi _duplicati"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Esegue le operazioni segnate"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/S_trumenti/Finestra di _log"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Configurazione"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configurazione/Preferenze _comuni..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configurazione/Configurazione _filtri..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Configurazione/Mo_dello..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configurazione/_Azioni..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Configurazione/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configurazione/_Preferenze per l'account attuale..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configurazione/Crea _nuovo account..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configurazione/_Modifica account..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configurazione/Cam_bia account attuale"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/A_iuto/_Manuale"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/A_iuto/_Manuale/Ingl_ese"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_iuto/_Manuale/_Giapponese"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/A_iuto/_FAQ"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_iuto/_FAQ/Ingl_ese"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_iuto/_FAQ/_Tedesco"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_iuto/_FAQ/_Spagnolo"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_iuto/_FAQ/_Francese"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_iuto/_FAQ/_Italiano"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/A_iuto/Opzioni linea _comando"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/A_iuto/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Creazione della finestra principale...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "niente"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Cambio del tipo di separazione della finestra da %d a %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Siete offline. Andare online?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Svuota cestino"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Svuotare tutti i messaggi nei cestini?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Aggiunta di una casella postale"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3581,16 +3582,16 @@ msgstr ""
 "Se è specificata una casella postale esistente, sarà\n"
 "esaminata automaticamente."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3600,67 +3601,67 @@ msgstr ""
 "Può darsi che esistano già alcuni file, oppure non si ha il permesso di "
 "scrittura."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vista cartella"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Rispondi a _tutti"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Rispondi _al mittente"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr "Siete offline. Fare click sull'icona per andare online."
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "Siete online. Fare click sull'icona per andare offline."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Esci"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Opzioni della linea di comando"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPZIONE]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3688,7 +3689,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3922,7 +3923,7 @@ msgstr "Account%d"
 msgid "Preferences for new account"
 msgstr "Preferenze per il nuovo account"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Preferenze dell'account"
 
@@ -3935,7 +3936,7 @@ msgid "Receive"
 msgstr "Ricevi"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Invia"
 
@@ -4150,7 +4151,7 @@ msgstr "Autentica con POP3 prima dell'invio"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Firma"
 
@@ -4612,7 +4613,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Editor"
 
@@ -5720,7 +5721,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Elimina [...] o (...) all'inizio dell'oggetto nella risposta"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
@@ -5934,80 +5935,90 @@ msgstr "Stampa"
 msgid "Print message"
 msgstr "Invia il messaggio"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Passo"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Server per la ricezione"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Esegui"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Esegue le operazioni segnate"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Preferenze"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Preferenze comuni"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Invia il messaggio"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Invia più tardi"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Mette nella cartella «Coda» e invia più tardi"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Bozze"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Salva nella cartella «Bozze»"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Inserisci"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Inserisce il file"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Allega"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Allega il file"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Aggiunge la firma"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Modifica con l'editor esterno"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "A capo riga"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Manda a capo tutte le righe lunghe"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Visualizza/V_ai a/Cartella di_fferente..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6259,7 +6270,7 @@ msgstr "Firma non trovata"
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da «%s»"
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Firma corretta"
 
@@ -6268,7 +6279,7 @@ msgstr "Firma corretta"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Firma valida, ma la chiave per «%s» non è fidata"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Firma valida (chiave non fidata)"
 
@@ -6304,7 +6315,7 @@ msgstr "Firma valida, ma la firma della chiave è stata revocata"
 msgid "BAD signature from \"%s\""
 msgstr "Firma DIFETTOSA da «%s»"
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "Firma DIFETTOSA"
 
@@ -6751,11 +6762,15 @@ msgstr "il file %s esiste già\n"
 msgid "Creating text view...\n"
 msgstr "Creazione della vista del testo...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Questo messaggio non può essere visualizzato.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -6763,31 +6778,31 @@ msgstr ""
 "Il corpo del testo non può essere mostrato perché la scrittura sul file "
 "temporaneo è fallita \n"
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "Sa_lva questa immagine come..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Componi un n_uovo messaggio"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Aggiungi alla ru_brica..."
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "Copia questo indi_rizzo"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "Apri c_on il browser web"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Copia questo _link"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6800,7 +6815,7 @@ msgstr ""
 "\n"
 "Aprirlo comunque?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Avvertimento falsificazione URL"
 
diff --git a/po/ja.po b/po/ja.po
index 70c5d0cf..bc6f6565 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-02 14:25+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+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"
@@ -51,161 +51,161 @@ msgstr "メッセージを %s に追加しています (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "メッセージ %s を %s に移動しています..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "メッセージ %s を %s にコピーしています..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "メッセージ %s を削除しています"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "deleted フラグをセットできません: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "expunge できません\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "%s のすべてのメッセージを削除しています"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "deleted フラグをセットできません: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "フォルダをクローズできません\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "ルートフォルダ %s が存在しません\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST の取得中にエラーが発生しました。\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s' を作成できません。\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOX の下に '%s' を作成できません。\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "メールボックスを作成できません: LIST に失敗\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "メールボックスを作成できません\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "メールボックスを名称変更できません: %s -> %s\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "メールボックスを削除できません\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "エンベロープを取得できません\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "メッセージのヘッダを取得中 (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "エンベロープを取得中にエラーが発生しました。\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "エンベロープを解析できません: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 サーバ: %s:%d に接続できません\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "%s:%d との IMAP4 セッションを確立できません\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "namespace を取得できません\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "フォルダ %s を選択できません\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "imap コマンド中のエラー: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 の認証に失敗しました。\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4のログインに失敗しました。\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s を %s に追加できません\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(ファイルを送信中...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "メッセージを %s に追加できません\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s を %s にコピーできません\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap コマンド中のエラー: STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap コマンド中のエラー: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "imap コマンド中のエラー: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv が UTF-7 を %s に変換できません\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv が %s を UTF-7 に変換できません\n"
@@ -297,20 +297,20 @@ msgstr "メッセージを %s から %s に書き出しています...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "メッセージ %s を %s にコピーできません\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "マークファイルを開けません。\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "移動元フォルダが移動先と同一です。\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "メッセージ %s%c%d を %s にコピーしています...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -319,7 +319,7 @@ msgstr ""
 "ファイル `%s' がすでに存在します。\n"
 "フォルダを作成できません。"
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
diff --git a/po/ko.po b/po/ko.po
index c295e49b..1aeb08d8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+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"
@@ -52,167 +52,167 @@ msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 msgid "Moving messages %s to %s ..."
 msgstr "메시지 %s%c%d를 %s로 이동합니다...\n"
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "삭제 플래그를 설정할 수가 없습니다: %d\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "지울 수가 없습니다\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "삭제 플래그를 설정할 수가 없습니다: 1:%d\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "폴더를 선택할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "표시 파일이 발견되지않음.\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST를 얻는 도중 에러가 발생.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s'를 생성할 수가 없습니다\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOX 아래에 '%s'를 생성할 수가 없습니다\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "우편함을 생성할 수 없습니다: LIST 실패\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "우편함을 생성할 수 없습니다\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "우편함명을 바꿀 수 없습니다: %s에서 %s로\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "우편함을 삭제할 수 없습니다\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "envelope를 얻을 수가 없습니다\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "envelope를 얻는 중 에러 발생.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "envelope를 파싱할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 서버에 연결할 수가 없습니다\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 세션을 만들 수 없습니다: %s: %d\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "namespace를 얻을 수 없습니다\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "폴더를 선택할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "인증 방법"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 로그인을 실패했습니다.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s를 %s에 붙일 수 없습니다\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(파일을 보냅니다...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "%s 메시지를 추가할 수가 없습니다\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%d를 %s로 복사할 수가 없습니다\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 명령어 실행중 에러: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv가 UTF-7를 %s로 변환할 수 없습니다\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv가 %s를 UTF-7로 변환할 수 없습니다\n"
@@ -304,20 +304,20 @@ msgstr "메시지를 %s에서 %s로 보냅니다...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "메시지 %s을 %s로 복사할 수가 없습니다\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "표시 파일을 열 수가 없습니다.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "옮길 폴더와 옮겨질 폴더가 같습니다.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -326,7 +326,7 @@ msgstr ""
 "파일 `%s'가 이미 존재합니다.\n"
 "폴더를 생성할 수가 없습니다."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -600,12 +600,12 @@ msgstr "  제목: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  발행인: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "파일 모드를 바꿀수가 없습니다\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s로 쓰기가 실패했습니다.\n"
@@ -676,7 +676,7 @@ msgstr ""
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -811,7 +811,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "주소록에 추가"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "주소"
 
@@ -824,7 +824,7 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/파일(_F)"
@@ -847,9 +847,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
@@ -871,11 +871,11 @@ msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
@@ -912,7 +912,7 @@ msgstr "/주소(_A)/편집(_E)"
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/도구(_T)"
@@ -921,12 +921,12 @@ msgstr "/도구(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
@@ -973,7 +973,7 @@ msgstr "/편집(_E)/붙여넣기(_P)"
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "주소록"
 
@@ -1038,7 +1038,7 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
@@ -1191,15 +1191,15 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "알림"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "경고"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "에러"
 
@@ -1305,7 +1305,7 @@ msgstr "/편집(_E)/실행취소(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/편집(_E)/다시 실행(_R)"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/편집(_E)/---"
@@ -1318,7 +1318,7 @@ msgstr "/편집(_E)/잘라내기(_t)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/편집(_E)/quotation으로 붙여넣기(_q)"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/편집(_E)/모두 선택(_a)"
 
@@ -1335,7 +1335,7 @@ msgstr "/편집(_E)/모든 긴 라인 자동 줄바꿈(_l)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/보기(_V)"
@@ -1357,9 +1357,9 @@ msgid "/_View/_Reply to"
 msgstr "/보기(_V)/Reply to(_R)"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/보기(_V)/---"
 
@@ -1380,7 +1380,7 @@ msgstr "/보기(_V)/첨부(_A)"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
@@ -1392,138 +1392,138 @@ msgstr ""
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/보기(_V)/문자셋(_C)/7bit 아스키 (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/보기(_V)/문자셋(_C)/유니코드(_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/보기(_V)/문자셋(_C)/중앙 유럽(ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/보기(_V)/문자셋(_C)/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/보기(_V)/문자셋(_C)/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/보기(_V)/문자셋(_C)/그리스(ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/보기(_V)/문자셋(_C)/터기 (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (ISo-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/보기(_V)/문자셋(_C)/Cyrillic (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/보기(_V)/문자셋(_C)/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (EUC-KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/보기(_V)/문자셋(_C)/Thai (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/도구(_T)/주소록(_A)"
 
@@ -1531,13 +1531,13 @@ msgstr "/도구(_T)/주소록(_A)"
 msgid "/_Tools/_Template"
 msgstr "/도구(_T)/템플릿(_T)"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/도구(_T)/---"
@@ -1576,71 +1576,71 @@ msgstr "%s: 파일이 없습니다\n"
 msgid "Can't get text part\n"
 msgstr "텍스트 부분을 얻을 수가 없습니다\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "인용 부호 형식 에러."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "메시지 회신/전달 형식 에러."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s파일이 없습니다\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s의 파일 크기를 알수가 없습니다\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "%s 파일이 빈 파일입니다."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "%s를 읽을 수가 없습니다."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 메시지 편집%s "
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 #, fuzzy
 msgid "Empty subject"
 msgstr "제목"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "제목이 비었습니다. 그래도 보낼까요?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "받는 사람 목록을 얻을 수가 없습니다"
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1648,21 +1648,21 @@ msgstr ""
 "메일을 보내기위한 계정이 지정되어있지않습니다.\n"
 "보내기 전에 메일 계정을 선택하세요."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "메시지를 보낸 편지함에 저장할 수가 없습니다"
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "현재 선택된 키 ID `%s'에 연결된 어떤 키도 찾을 수 없습니다."
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1672,12 +1672,12 @@ msgstr ""
 "메시지의 문자셋을 변경할 수가 없습니다.\n"
 "그래도 보낼까요?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 #, fuzzy
 msgid "Code conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1686,15 +1686,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1703,86 +1703,86 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "오래된 메시지를 제거할 수가 없습니다\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "메시지를 임시 보관합니다...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "큐 폴더를 찾을 수가 없습니다\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "메시지를 임시 보관할 수가 없습니다\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "생성된 Message-ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "편집창을 생성합니다...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/도구(_T)/동작(_n)"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "마임 타입"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "크기"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1792,52 +1792,52 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -1995,12 +1995,12 @@ msgstr "폴더 편집"
 msgid "Input the new name of folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "새 폴더"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
@@ -2168,42 +2168,42 @@ msgstr "스풀 디렉토리"
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "받은 편지함"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "발송 편지함"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "보낼 편지함"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "지운 편지함"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "임시 보관함"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "새 폴더"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c'는 폴더 이름에 포함될 수 없습니다."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' 폴더가 이미 존재합니다."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' 폴더를 생성할 수가 없습니다."
@@ -2295,57 +2295,57 @@ msgstr "폴더 정보를 설정합니다...\n"
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "폴더 트리 갱신"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s 폴더가 선택되었습니다\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2355,26 +2355,26 @@ msgstr ""
 "(만일 하위폴더를 저장하기 위한 폴더를 생성하려면,\n"
 "이름의 마지막에 `/'를 추가하세요)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s'에대한 새 이름을 넣으세요:"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "폴더 이름 변경"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2383,12 +2383,12 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 #, fuzzy
 msgid "Delete search folder"
 msgstr "폴더 삭제"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2399,21 +2399,21 @@ msgstr ""
 "`%s'아래에 있는 모든 폴더와 메시지가 삭제될 것입니다.\n"
 "정말로 삭제하시겠습니까?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2422,34 +2422,34 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "정말로 `%s' IMAP4 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 계정 삭제"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "정말로 `%s' 뉴스그룹을 삭제하시겠습니까?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "뉴스그룹 삭제"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "정말로 `%s' 뉴스그룹 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "뉴스그룹 계정 삭제"
 
@@ -2595,199 +2595,199 @@ msgstr ""
 msgid "Sylpheed: %d new messages"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "인증"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "새 메시지를 가져옴"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "취소되었습니다"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "완료 (새 메시지 없음)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "인증이 실패했습니다."
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "끝났습니다 (%d개의 새로운 메시지)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "끝났습니다 (새 메시지 없음)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "편지를 받다가 에러가 발생했습니다."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s 계정으로부터 새 메시지를 얻습니다...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "인증"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 새 메시지를 가져옴"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 서버 %s에 연결합니다..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "%s:%d POP3 서버에 연결할 수가 없습니다\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "인증 중입니다..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "새 메시지의 갯수를 얻는 중 (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "새 메시지의 갯수를 얻는 중 (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "새 메시지의 갯수를 얻는 중 (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "메시지의 크기를 얻는 중 (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d 메시지를 삭제하는 중"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "끝마치는 중"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "메시지 (%d / %d) 를 가져오는 중 (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "완료 (%d 메시지 (%s)가 받아짐)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 #, fuzzy
 msgid "Connection failed."
 msgstr "연결이 실패했습니다"
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "디스크에 남은 공간이 없슴."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "파일에 쓸 수가 없습니다."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "소켓 에러."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "메일박스가 잠겨있습니다."
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 #, fuzzy
 msgid "Authentication failed."
 msgstr "인증 방법"
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "인증 방법"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "병합이 취소되었습니다.\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s로부터 %s로 새 메시지를 가져옴...\n"
@@ -2909,7 +2909,7 @@ msgstr ""
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "보내지지 않은 메시지가 큐에 있습니다. 지금 종료할까요?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2918,709 +2918,709 @@ msgstr ""
 "OpenPGP 지원기능을 끕니다."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "다른 Sylpheed가 이미 실행되고 있습니다.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "동작 설정을 씁니다...\n"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/파일(_F)/폴더(_F)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/파일(_F)/폴더(_F)/새 폴더(_n)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/파일(_F)/폴더(_F)/폴더 이름 변경(_R)..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/파일(_F)/폴더(_F)/폴더 이름 변경(_R)..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/파일(_F)/폴더(_F)/폴더 삭제(_D)"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/파일(_F)/메일 박스 추가(_A)..."
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/파일(_F)/메일 박스 추가(_A)..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/메일박스를 지우기(_m)"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/파일(_F)/폴더(_F)"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/새 메시지 확인(_C)"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/파일(_F)/모든 폴더의 새 메시지 확인(_C)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/폴더 트리 갱신(_e)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/파일(_F)/mbox 파일 가져오기(_I)..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/파일(_F)/mbox 파일로 저장(_E)..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/파일(_F)/지운 편지함 비우기(_t)"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/파일(_F)/새 이름으로(_S)..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/파일(_F)/새 이름으로(_S)..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/파일(_F)/인쇄(_P)..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/파일(_F)/파일 삽입(_I)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/파일(_F)/끝내기(_x)"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/편집(_E)/쓰레드 선택(_t)"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/편집(_E)/현재 메시지 찾기(_F)..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/편집(_E)/메시지 찾기(_S)..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/보기(_V)/보이거나 감추기(_d)"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/보기(_V)/보이거나 감추기(d)/폴더 트리(_F)"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/보기(_V)/보이거나 감추기(_d)/메시지 보기(_M)"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘과 텍스트(_a)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘(_I)"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/아이콘(_I)"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/텍스트(_T)"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/보기(_V)/보이거나 감추기(_d)/툴바(_T)/없음(_N)"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/상태바(_b)"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/보기(_V)/보이거나 감추기(_d)/상태바(_b)"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/보기(_V)/별도의 폴더 트리 창(_o)"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/보기(_V)/별도의 메시지 창(_e)"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/보기(_V)/정렬(_S)"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/보기(_V)/정렬(_S)/번호(_n)"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/보기(_V)/정렬(_S)/크기(_i)"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/보기(_V)/정렬(_S)/날짜(_d)"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/보기(_V)/정렬(_S)/날짜(_d)"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/보기(_V)/정렬(_S)/보낸 사람(_f)"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/보기(_V)/정렬(_S)/크기(_i)"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/보기(_V)/정렬(_S)/제목(_s)"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/보기(_V)/정렬(_S)/색 라벨(_c)"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/보기(_V)/정렬(_S)/표시(_m)"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/보기(_V)/정렬(_S)/않읽음(_u)"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/보기(_V)/정렬(_S)/첨부(_t)"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/보기(_V)/정렬(_S)/않함(_o)"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/보기(_V)/정렬(_S)/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/보기(_V)/정렬(_S)/오름차순"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/명령(_S)/정렬(_S)/제목(_A)"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/보기(_V)/쓰레드 보기(_r)"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/보기(_V)/모든 쓰레드 펴기(_x)"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/보기(_V)/모든 쓰레드 접기(_l)"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/보기(_V)/표시 항목 설정(_i)..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/보기(_V)/가기(_G)"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/명령(_S)/가기(_G)/이전 메시지(_P)"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/보기(_V)/가기(_G)/다음 메시지(_N)"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/보기(_V)/가기(_G)/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/보기(_V)/가기(_G)/안읽은 다음 메시지(_e)"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/보기(_V)/가기(_G)/안읽은 다음 메시지(_e)"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/보기(_V)/가기(_G)/이전 새 메시지(_w)"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/보기(_V)/가기(_G)/다음 새 메시지(_x)"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/보기(_V)/가기(_G)/표시된 이전 메시지(_m)"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/보기(_V)/가기(_G)/표시된 다음 메시지(_a)"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/보기(_V)/가기(_G)/꼬리표있는 이전 메시지(_l)"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/보기(_V)/가기(_G)/꼬리표있는 다음 메시지(_b)"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/보기(_V)/문자셋(_C)/자동(_A)"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/보기(_V)/문자셋(_C)/서부 유럽(ISO-8859-15)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/보기(_V)/문자셋(_C)/일본 (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/보기(_V)/문자셋(_C)/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/보기(_V)/문자셋(_C)/Chinese (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/보기(_V)/새 창으로 열기(_w)"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/보기(_V)/메시지 소스(_a)"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/보기(_V)/모든 헤더(_h)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/보기(_V)/요약 갱신(_U)"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/메시지(_M)"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:755
 #, fuzzy
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/메시지(_M)/받기 취소(_g)"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/메시지(_M)/임시 보관된 메시지 발송(_S)"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/메시지(_M)/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/메시지(_M)/새로 만들기(_n)"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/메시지(_M)/회신(_R)"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/메시지(_M)/회신(_y)"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/메시지(_M)/회신(_y)/전체(_a)"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/메시지(_M)/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/메시지(_M)/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/메시지(_M)/전달(_F)"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/메시지(_M)/첨부파일로 전달(_w)"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/메시지(_M)/Redirec_t"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/메시지(_M)/이동(_o)..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/메시지(_M)/복사(_C)..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/메시지(_M)/표시(_M)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/메시지(_M)/표시(_M)/표시(_M)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/메시지(_M)/표시(_M)/표시 지움(_U)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/메시지(_M)/표시(_M)/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/메시지(_M)/표시(_M)/읽지않은 것으로 표시(_e)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/메시지(_M)/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/메시지(_M)/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/메시지(_M)/표시(_M)/모두 읽은 것으로 표시(_r)"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/메시지(_M)/삭제(_D)"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/메시지(_M)/새 메일 받기(_i)"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/메시지(_M)/다시 편집(_e)"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/도구(_T)/주소록에 보낸이 추가(_k)"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/도구(_T)/필터 규칙 생성(_C)"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/자동(_A)"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/보낸이로(_F)"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/받는이로(_T)"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/도구(_T)/필터 규칙 생성(_C)/제목으로(_S)"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/도구(_T)/메시지 필터(_F)"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/도구(_T)/중복된 메시지 지우기(_p)"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "표시된 프로세스들을 실행합니다"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/도구(_T)/로그 창(_L)"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/설정(_C)"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/설정(_C)/기본적인 설정(_C)..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/설정(_C)/필터 설정(_F)..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/설정(_C)/템플릿(_T)..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/설정(_C)/동작(_A)..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/설정(_C)/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/설정(_C)/계정에 따른 설정(_P)..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/설정(_C)/새 계정 만들기(_n)..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/설정(_C)/계정 편집(_E)..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/설정(_C)/현재 계정을 변경(_h)"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/도움말(_H)/설명서(_M)"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/도움말(_H)/설명서(_M)/영어(_E)"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/도움말(_H)/설명서(_M)/일본어(_J)"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/도움말(_H)/FAQ(_F)"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/도움말(_H)/FAQ(_F)/영어(_E)"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/도움말(_H)/FAQ(_F)/독일어(_G)"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/도움말(_H)/FAQ(_F)/스페인어(_S)"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/도움말(_H)/FAQ(_F)/프랑스어(_F)"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/도움말(_H)/FAQ(_F)/이태리어(_I)"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "명령이 지정되지않음"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/도움말(_H)/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "새 창을 만듭니다...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "마침.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "제목 없슴"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "없음"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "창 분리 형식을 %d에서 %d로 바꿉니다\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 #, fuzzy
 msgid "Empty all trash"
 msgstr "지운 편지함 비우기"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "메일박스 추가"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3631,16 +3631,16 @@ msgstr ""
 "기존의 메일 박스가 지정되면 자동으로\n"
 "스캔될것입니다."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3649,72 +3649,72 @@ msgstr ""
 "메일박스 생성이 실패했습니다.\n"
 "아마 어떤 파일이 이미 존재하거나 그 곳에 쓰기 권한이 없습니다."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 폴더 보기"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "전부에게 회신을 보냅니다"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "끝내기"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "이 프로그램을 끝내시겠습니까?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 #, fuzzy
 msgid "Command line options"
 msgstr "명령이 지정되지않음"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "사용법: %s [옵션]...\n"
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3730,7 +3730,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3952,7 +3952,7 @@ msgstr "계정%d"
 msgid "Preferences for new account"
 msgstr "새 계정에대한 설정"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "계정 기본 설정"
 
@@ -3965,7 +3965,7 @@ msgid "Receive"
 msgstr "받기"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "메일 발송"
 
@@ -4186,7 +4186,7 @@ msgstr "보내기전 POP3와 인증"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "서명"
 
@@ -4632,7 +4632,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "편집기"
 
@@ -5790,7 +5790,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "계정"
 
@@ -6003,81 +6003,90 @@ msgstr "인쇄"
 msgid "Print message"
 msgstr "메시지 보내기"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+msgid "Stop"
+msgstr ""
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "받는 서버"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "실행"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "표시된 프로세스들을 실행합니다"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "설정"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "기본적인 환경 설정"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "메시지 보내기"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "나중에 보내기"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "보낼 편지함에 넣어서 나중에 보내기"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "임시 보관함"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "삽입"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "파일을 삽입합니다"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "첨부"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "파일 첨부"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 #, fuzzy
 msgid "Append signature"
 msgstr "BAD signature"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "외부 편집기로 편집"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "줄바꿈"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "긴 줄에대해 자동 줄바꿈을 합니다"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/보기(_V)/가기(_G)/다른 폴더로(_f)..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
 "the order by using the Up / Down button."
@@ -6328,7 +6337,7 @@ msgstr "서명이 발견되지않음"
 msgid "Good signature from \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Good signature"
 
@@ -6337,7 +6346,7 @@ msgstr "Good signature"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6373,7 +6382,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr ""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "BAD signature"
 
@@ -6830,47 +6839,51 @@ msgstr "%s 파일이 이미 존재합니다\n"
 msgid "Creating text view...\n"
 msgstr "텍스트 뷰를 생성합니다...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "이 메시지를 받지않을 것입니다\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/새 이름으로(_S)..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/주소록에 보낸이 추가(_k)"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "공용 주소록"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "웹 탐색기"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6879,7 +6892,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index 99a7ec3a..fb293a91 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+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"
@@ -51,161 +51,161 @@ msgstr "Pridedami laiškai į %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "Perkeliami laiškai %s į %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopijuojami laiškai %s į %s ..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Šalinami laiškai %s..."
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "negaliu nustatyti ištrynimo žymų: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "negaliu išbraukti\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Trinami laiškai iš %s..."
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "negaliu nustatyti ištrynimo žymų: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "negaliu uždaryti katalogo\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "šakninis katalogas %s neegzistuoja\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "klaida gaunant LIST.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Negaliu sukurti „%s“\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "negaliu sukurti „%s“ po INBOX\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "negaliu sukurti dėžutės: nepavyko LIST\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "negaliu sukurti dėžutės\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "negaliu pervadinti dėžutės: %s į %s\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "negaliu ištrinti dėžutės\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "nagaliu gauti voko\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Gaunamos laiškų antraštės (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "klaida gaunant voką.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "negaliu išanalizuoti voko: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie IMAP4 serverio: %s:%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Negaliu sukurti IMAP4 sesijos su: %s:%d\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "negalių gauti vardų zonos\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "negaliu pasirinkti katalogo: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "klaida vykdant imap komandą: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentiškumo tikrinimas nepavyko.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "nepavyko prisijungti prie IMAP4\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "negaliu prirašyti %s į %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(siunčiamas failas...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "negaliu pridėti laiško į %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "negaliu nukopijuoti %s į %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "klaida vykdant imap komandą: STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "klaida vykdant imap komandą: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "klaida vykdant imap komandą: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv negali konvertuoti UTF-7 į %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv negali konvertuoti %s į UTF-7\n"
@@ -297,20 +297,20 @@ msgstr "Eksportuojami laiškai iš %s į %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "negaliu nukopijuoti laiško %s į %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Negaliu atidaryti žymų failo.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "pradinis katalogas identiškas paskirties katalogui.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopijuoju laišką %s%c%d į %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -319,7 +319,7 @@ msgstr ""
 "Failas „%s“ jau egzistuoja.\n"
 "Negaliu sukurti katalogo."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -595,12 +595,12 @@ msgstr "  Tema: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Leidėjas: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "negaliu pakeisti failo rėžimo\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "nepavyko įrašyti į „%s“.\n"
@@ -683,7 +683,7 @@ msgstr ""
 "skulpelyje „G“ jei norite gauti laiškus pasirinkę „Gauti visus“."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -818,7 +818,7 @@ msgstr "Vartotojo veiksmo argumentas"
 msgid "Add Address to Book"
 msgstr "Įdėti adresą į knygą"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresas"
 
@@ -831,7 +831,7 @@ msgstr "Pastabos"
 msgid "Select Address Book Folder"
 msgstr "Pažymėkite adresų knygos katalogą"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Failas"
@@ -853,9 +853,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Failas/Naujas _LDAP serveris"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Failas/---"
@@ -877,11 +877,11 @@ msgid "/_File/_Close"
 msgstr "/_Failas/_Užverti"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Taisa"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Taisa/Kopi_juoti"
@@ -918,7 +918,7 @@ msgstr "/_Adresas/_Redaguoti"
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Į_rankiai"
@@ -927,12 +927,12 @@ msgstr "/Į_rankiai"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Į_rankiai/Importuoti _LDIF failą"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
@@ -979,7 +979,7 @@ msgstr "/_Taisa/Į_dėti"
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Adresų knyga"
 
@@ -1044,7 +1044,7 @@ msgstr ""
 "Ar tikrai norite pašalinti katalogą „%s“ ir visus adresus jame? \n"
 "Jei pašalinsite tik katalogą, adresai bus perkelti į aukštesnįjį katalogą."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
@@ -1198,15 +1198,15 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Pranešimas"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Klaida"
 
@@ -1306,7 +1306,7 @@ msgstr "/_Taisa/_Atšaukti"
 msgid "/_Edit/_Redo"
 msgstr "/_Taisa/Pa_kartoti"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Taisa/---"
@@ -1319,7 +1319,7 @@ msgstr "/_Taisa/Iškirp_ti"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Taisa/Įdėti kaip _citatą"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Taisa/Žymėti _viską"
 
@@ -1335,7 +1335,7 @@ msgstr "/_Taisa/Laužyti _visas ilgas eilutes"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Taisa/_Automatiškai laužyti"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/Ro_dymas"
@@ -1357,9 +1357,9 @@ msgid "/_View/_Reply to"
 msgstr "/Ro_dymas/Kam _atsakyti"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Ro_dymas/---"
 
@@ -1380,7 +1380,7 @@ msgstr "/Ro_dymas/Prise_gti failai"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Ro_dymas/_Eiti į/Kitas ka_talogas"
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Ro_dymas/Simbolių ko_duotė"
 
@@ -1391,113 +1391,113 @@ msgstr "/Ro_dymas/Simbolių ko_duotė/_Automatiškai"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Ro_dymas/Simbolių ko_duotė/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Unikodas (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Vakarų Europos (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Vakarų Europos (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Centrinės Europos (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/_Baltų (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Baltų (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Arabų (Windows-1256)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Graikų (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Arabų (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Arabų (Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Hebrajų (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Hebrajų (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Turkų (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (KOI8-U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kirilica (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Supaprastinta Kinų (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Supaprastinta Kinų (GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tradicinė Kinų (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Korėjiečių (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tailandiečių (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tailandiečių (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/Į_rankiai/_Adresų knyga"
 
@@ -1505,13 +1505,13 @@ msgstr "/Į_rankiai/_Adresų knyga"
 msgid "/_Tools/_Template"
 msgstr "/Į_rankiai/_Šablonas"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/Į_rankiai/_Veiksmai"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/Į_rankiai/---"
@@ -1545,70 +1545,70 @@ msgstr "%s: failas neegzistuoja\n"
 msgid "Can't get text part\n"
 msgstr "Negaliu gauti dalies teksto\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Formato klaida."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Atsakymo/persiuntimo formato klaida."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Negaliu gauti failo „%s“ dydžio\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Failas %s yra tuščias"
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Negaliu perskaityti %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Laiškas: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Rašyti laišką%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Nenurodytas gavėjas."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Nėra temos"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Nenurodyta laiško tema (subject). Siųsti?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "Negaliu gauti gavėjų sąrašo."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1616,21 +1616,21 @@ msgstr ""
 "Nenurodyta sąskaita pašto siuntimui.\n"
 "Prieš siųsdami pažymėkitę norimą sąskaitą."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Klaida siunčiant laišką %s ."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Negaliu išsaugoti laiško „outbox“."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1641,11 +1641,11 @@ msgstr ""
 "\n"
 "Ar siųsti kaip %s?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Kodo konvertavimo klaida"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1658,15 +1658,15 @@ msgstr ""
 "\n"
 "Ar tikrai norite ją išsiųsti?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Eilutės ilgio limitas"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1675,83 +1675,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "Negaliu pašalinti seno laiško\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "Laiškas dedamas į eilę...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "Negaliu rasti eilės (queue) katalogo\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "Negaliu įdėti laiško į eilę\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "sugeneruotas Message-ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Sukuriamas laiško kūrimo langas...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "PGP parašas"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "MIME tipas"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Dydis"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1760,48 +1760,48 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -1958,12 +1958,12 @@ msgstr "Redaguoti katalogą"
 msgid "Input the new name of folder:"
 msgstr "Įveskite katalogo pavadinimą:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Įveskite naujo katalogo pavadinimą:"
 
@@ -2130,42 +2130,42 @@ msgstr "Pasirinkti katalogą"
 msgid "Select folder"
 msgstr "Pasirinkti katalogą"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Gauti"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Išsiųsti"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Eilė"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Šiukšlinė"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Juodraščiai"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "NaujasKatalogas"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c“ negali būti katalogo pavadinime."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalogas „%s“ egzistuoja."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Negaliu sukurti katalogo „%s“."
@@ -2252,56 +2252,56 @@ msgstr "Nustatoma katalogo informacija...\n"
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Perkurti katalogų medį"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Bus perkurtas katalogų medis. Tęsti?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Perkuriamas katalogų medis..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Katalogų medžio perkūrimas nepavyko."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Tikrinami nauji laiškai visuose kataloguose..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Nereikalingas"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pažymėtas katalogas „%s“\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Gaunami laiškai („%s“)..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Klaida gaunant laiškus („%s“)."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2311,26 +2311,26 @@ msgstr ""
 "(jei norite sukurti katalogą talpinti pakatalogiams,\n"
 " pridėkite „/“ prie vardo pabaigos)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Įveskite naują „%s“ pavadinimą:"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Pervadinti katalogą"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Negaliu pervadinti katalogo „%s“"
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Negaliu perkelti katalogo „%s“"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2339,11 +2339,11 @@ msgstr ""
 "Ištrinti paieškos katalogą „%s“ ?\n"
 "Tikri laiškai nebus trinami."
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Ištrinti paieškos katalogą"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2356,20 +2356,20 @@ msgstr ""
 "\n"
 "Ar tikrai norite ištrinti?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Negaliu pašalinti katalogo „%s“"
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Ištrinti visus laiškus šiukšlinėje?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2378,34 +2378,34 @@ msgstr ""
 "Ar tikrai pašalinti dėžutę „%s“ ?\n"
 "(laiškai NEBUS ištrinti iš disko)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ar tikrai ištrinti IMAP4 sąskaitą „%s“?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Ištrinti IMAP4 sąskaitą"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ar tikrai ištrinti naujienų grupę „%s“?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Ištrinti naujienų grupę"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ar tikrai pašalinti naujienų sąskaitą „%s“?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Pašalinti naujienų sąskaitą"
 
@@ -2551,143 +2551,143 @@ msgstr "Baigti"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nauji laiškai"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Tikrinamas autentiškumas"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Gaunami nauji laiškai"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Laukiama"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Nutraukta"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Gaunama"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Atlikta (gauta laiškų: %d (%s))"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Atlikta (naujų laiškų negauta)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Nepavyko prisijungti"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Nepavyko patvirtinti autentiškumo"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Užrakinta"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Baigėsi skirtasis laikas"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Baigta (Nauji laiškai: %d)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Baigta (Nėra naujų laiškų: %d)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Klaidos gaunant paštą."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "gaunami „%s“ sąskaitos laiškai...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Tikrinamas autentiškumas"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: gaunami nauji laiškai"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Jungiuosi prie POP3 serverio: %s..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie POP3 serverio: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Patvirtinamas autentiškumas..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Gaunami laiškai iš %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Gaunamas naujų laiškų skaičius (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Gaunamas naujų laiškų skaičius (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Gaunamas naujų laiškų skaičius (UILD)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Gaunamas naujų laiškų dydis (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Trinamas laiškas %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Išeinu"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Gaunamas laiškas (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gaunama (Gauti laiškai: %d (%s))"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Nepavyko prisijungti."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Klaida tvarkant paštą."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2696,28 +2696,28 @@ msgstr ""
 "Klaida tvarkant paštą:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Nėra vietos diske."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Negaliu įrašyti į failą."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Socket error."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Prisijungimas uždarytas nuotolinio serverio."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Dėžutė užrakinta."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2726,11 +2726,11 @@ msgstr ""
 "Dėžutė užrakinta:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Nepavyko patvirtinti autentiškumo."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2739,15 +2739,15 @@ msgstr ""
 "Nepavyko patvirtinti autentiškumo:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Baigėsi sesijos laikas."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Prijungimas nutrauktas\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Gaunami nauji laiškai iš %s į %s...\n"
@@ -2877,7 +2877,7 @@ msgstr "Laiškai eilėje"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Eilėje yra neišsiųstų laiškų. Išeiti dabar?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2886,15 +2886,15 @@ msgstr ""
 "OpenPGP palaikymas išjungtas."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed jau paleistas.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Konfigūracijos atnaujinimas"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2902,657 +2902,658 @@ msgstr ""
 "Rasta senos versijos konfigūracija.\n"
 "Ar norite ją atnaujinti?"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Failas/_Katalogas"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Failas/_Katalogas/Sukurti _naują..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Failas/_Katalogas/Pe_rvadinti..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Failas/_Katalogas/Per_kelti..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Failas/_Katalogas/_Ištrinti"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Failas/_Dėžutė"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Failas/_Dėžutė/Pridėti _naują"
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Failas/_Dėžutė/_Pašalinti"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_Failas/_Dėžutė/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Failas/_Dėžutė/Patikrinti naujas ž_inutes"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Failas/_Dėžutė/Patikrinti naujas žinu_tes visose dėžutėse"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Failas/_Dėžutė/P_erkurti katalogų medį"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Failas/_Importuoti „mbox“ failą..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Failas/_Eksportuoti į „mbox“ failą..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Failas/Išvaly_ti šiukšlinę"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Failas/Išsaugoti _kaip..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Failas/Išsaugoti _kaip..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Failas/_Spausdinti..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Failas/_Dirbti atsijungus"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Failas/Iš_eiti"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Taisa/Pažymė_ti giją"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Taisa/_Rasti laiške"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Taisa/_Ieškoti laiškų..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/_Katalogų medis"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/_Laiško peržiūra"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 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:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta/P_iktogramos"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta/P_iktogramos"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta/_Tekstas"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/Į_rankių juosta/_Nieko"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/_Paieškos juosta"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Ro_dymas/Ro_dyti arba paslėpti/_Būsenos juosta"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/Ro_dymas/_Eiti į/Kitas ka_talogas"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/Ro_dymas/Atskirti _katalogų medį"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/Ro_dymas/Atskirti žin_utės peržiūrą"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/Ro_dymas/_Rikiuoti"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _numerį"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _dydį"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/Ro_dymas/_Rikiuoti/pagal d_atą"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Ro_dymas/_Rikiuoti/pagal gi_jos datą"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _siuntėją"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _gavėją"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _temą"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _spalvos etiketę"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/Ro_dymas/_Rikiuoti/pagal ž_ymę"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/Ro_dymas/_Rikiuoti/pagal ne_skaitytus"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Ro_dymas/_Rikiuoti/pagal _priedą"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Ro_dymas/_Rikiuoti/Ne_rikiuoti"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/Ro_dymas/_Rikiuoti/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/Ro_dymas/_Rikiuoti/_Didėjimo tvarka"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/Ro_dymas/_Rikiuoti/_Mažėjimo tvarka"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Ro_dymas/_Rikiuoti/P_agal temą"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/Ro_dymas/_Gijų peržiūra"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/Ro_dymas/Iš_skleisti visas gijas"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/Ro_dymas/Su_traukti visas gijas"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/Ro_dymas/Nustatyt_i rodomus laukus"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/Ro_dymas/_Eiti į"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Ro_dymas/_Eiti į/_Ankstesnis laiškas"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/Ro_dymas/_Eiti į/_Kitas laiškas"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/Ro_dymas/_Eiti į/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Ro_dymas/_Eiti į/Ankstesnis neskaitytas laiškas"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Ro_dymas/_Eiti į/Kitas neskaitytas laiškas"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Ro_dymas/_Eiti į/Ankstesnis naujas laiškas"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Ro_dymas/_Eiti į/Kitas naujas laiškas"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Ro_dymas/_Eiti į/Ankstesnis pažymėtas laiškas"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Ro_dymas/_Eiti į/Kitas pažymėtas laiškas"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Ro_dymas/_Eiti į/Ankstesnis laiškas su etikete"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Ro_dymas/_Eiti į/Kitas laiškas su etikete"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Ro_dymas/_Eiti į/Kitas ka_talogas"
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Ro_dymas/Simbolių ko_duotė/_Automatiškai"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Vakarų Europos (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Japonų (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Tradicinė Kinų (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Kinų (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Korėjiečių (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/Ro_dymas/Atverti naujame _lange"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/Ro_dymas/Laiško pr_adinis tekstas"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Ro_dymas/_Visos antraštės"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/Ro_dymas/Atna_ujinti santrauką"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Laiškas"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/_Laiškas/_Gauti"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Laiškas/_Gauti/Gauti iš _esamos sąskaitos"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Laiškas/_Gauti/Gauti iš _visų sąskaitų"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Laiškas/_Gauti/_Nutraukti gavimą"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Laiškas/_Gauti/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Laiškas/_Siųsti laiškus eilėje"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Laiškas/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Laiškas/Rašyti _naują"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Laiškas/_Atsakyti"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Laiškas/Atsak_yti kam"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Laiškas/Atsak_yti kam/_visiems"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Laiškas/Atsak_yti kam/_siuntėjui"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Laiškas/Atsak_yti kam/pašto _konferencijai"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Laiškas/_Persiųsti"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Laiškas/Persiųsti kaip p_riedą"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Laiškas/Nukreip_ti"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Laiškas/Per_kelti..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Laiškas/K_opijuoti..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Laiškas/Žy_ma"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Laiškas/Žy_ma/Pažy_mėti"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Laiškas/Žy_ma/_Nežymėti"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Laiškas/Žy_ma/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Laiškas/Žy_ma/Ne_skaitytas"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Laiškas/Žy_ma/Skai_tytas"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Laiškas/Žy_ma/Skai_tyta gija"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Laiškas/Žy_ma/Skaityti _visi"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Laiškas/_Trinti"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Laiškas/Pažymėti kaip nereikalingą"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Laiškas/Pažymėti kaip reikalingą"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Message/P_ertaisyti"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Į_rankiai/Įrašyti siuntėją į adresų _knygą"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Į_rankiai/_Filtruoti laiškus kataloge"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Į_rankiai/Filtruoti pa_sirinktus laiškus"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/_Automatiškai"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Siuntėją"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Gavėją"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Temą"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Į_rankiai/_Filtruoti nereikalingą paštą kataloge"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Į_rankiai/Filtruoti nereikalingus tarp pa_sirinktų laiškų"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Į_rankiai/Ištrinti _vienodus laiškus"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Vykdyti pažymėtus procesus"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/Į_rankiai/„_Log“ langas"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Nustatymai"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Nustatymai/Bendri _nustatymai..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Nustatymai/_Filtro nustatymai..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Nustatymai/Ša_blonai..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Nustatymai/Veiksm_ai..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Nustatymai/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Nustatymai/_Esamos sąskaitos nustatymai"
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Nustatymai/Sukurti _naują sąskaitą..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Nustatymai/R_edaguoti sąskaitas..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Nustatymai/Keisti esamą sąskaitą"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Pagalba/_Instrukcija"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pagalba/_Instrukcija/_English"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pagalba/_Instrukcija/_Japanese"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/_Pagalba/_DUK"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pagalba/_DUK/_English"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pagalba/_DUK/_German"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pagalba/_DUK/_Spanish"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pagalba/_DUK/_French"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pagalba/_DUK/_Italian"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/_Pagalba/_Komandinės eilutės parametrai"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Pagalba/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Kuriamas pagrindinis langas..\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "atlikta.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Bevardis"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "nieko"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Keičiamas lango dalijimo tipas iš %d į %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Jūs esate atsijungęs. Prisijungti?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Išvalyti visas šiukšlines"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Ištrinti visus laiškus šiukšlinėje?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Pridėti dėžutę"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3562,16 +3563,16 @@ msgstr ""
 "Jeigu ji egzistuoja, ji bus\n"
 "nuskaityta automatiškai."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Dėžutė"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3580,67 +3581,67 @@ 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:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Katalogų peržiūra"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Laiško peržiūra"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Atsakyti"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Atsakyti _visiems"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Atsakyti _siuntėjui"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Atsakyti _konferencijai"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Persiųsti"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Pe_rsiųsti kaip priedą"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Nukreip_ti"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr "Jūs esate atsijungęs. Spustelkite piktogramą jei norite prisijungti."
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "Jūs esate prisijungęs. Spustelkite piktogramą jei norite atsijungti."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Išeiti"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Užverti programą?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Komandinės eilutės parametrai"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Naudojimas: sylpheed [PARAMETRAI]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3668,7 +3669,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3901,7 +3902,7 @@ msgstr "Sąskaita%d"
 msgid "Preferences for new account"
 msgstr "Naujos sąskaitos nustatymai"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Sąskaitos nustatymai"
 
@@ -3914,7 +3915,7 @@ msgid "Receive"
 msgstr "Gauti"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Siųsti"
 
@@ -4128,7 +4129,7 @@ msgstr "Prieš siunčiant patikrinti autentiškumą su POP3"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Parašas"
 
@@ -4588,7 +4589,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Redaktorius"
 
@@ -5689,7 +5690,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Atsakant ištrinti [...] arba (...) temos pradžioje"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Sąskaita"
 
@@ -5902,80 +5903,90 @@ msgstr "Spausdinti"
 msgid "Print message"
 msgstr "Siųsti laišką"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Žingsnis"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Serveris pašto gavimui"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Vykdyti"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Vykdyti pažymėtus procesus"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Nustatymai"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Bendri nustatymai"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Siųsti laišką"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Siųsti vėliau"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Įdėti į eilę ir siųsti vėliau"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Juodraštis"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Išsaugoti į juodraščių katalogą"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Įterpti"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Įterpti failą"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Prisegti"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Prisegti failą"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Pridėti parašą"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Naudoti išorinį redaktorių"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Eilučių laužymas"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Laužyti ilgas eilutes"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/Ro_dymas/_Eiti į/Kitas ka_talogas"
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6227,7 +6238,7 @@ msgstr "Parašas nerastas"
 msgid "Good signature from \"%s\""
 msgstr "Geras parašas nuo „%s“"
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Geras parašas"
 
@@ -6236,7 +6247,7 @@ msgstr "Geras parašas"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Geras parašas, bet „%s“ raktas nėra patikimas"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Geras parašas (nepatikimas raktas)"
 
@@ -6272,7 +6283,7 @@ msgstr "Parašas geras, bet raktas buvo pakeistas"
 msgid "BAD signature from \"%s\""
 msgstr "BLOGAS „%s“ parašas"
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "BLOGAS parašas"
 
@@ -6719,41 +6730,45 @@ msgstr "failas %s jau egzistuoja\n"
 msgid "Creating text view...\n"
 msgstr "Sukuriama teksto peržiūra...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Laiškas negali būti parodytas.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "Saugoti pa_veikslėlį kaip"
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Rašyti _naują laišką"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Pridėti į adresų _knygą"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "Kopijuoti ad_resą"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "_Atverti su naršykle"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Kopijuoti _nuorodą"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6766,7 +6781,7 @@ msgstr ""
 "\n"
 "Visvien atverti?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Perspėjimas dėl netikro URL"
 
diff --git a/po/nl.po b/po/nl.po
index 633850f4..a2fd98a9 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -52,163 +52,163 @@ msgstr "Berichten toevoegen aan %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "Berichten %s worden verplaatst naar %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Berichten %s worden gekopieerd naar %s..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Berichten %s worden verwijderd"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan verwijderd-vlaggen niet instellen: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "kan niet wissen\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Alle berichten in %s worden verwijderd"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan de verwijderd-vlaggen niet instellen: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "kan map niet sluiten\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "De beginmap %s bestaat niet\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "er is een fout opgetreden bij het ophalen van de lijst.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr ""
 "kan %s niet aanmaken\n"
 "\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan %s niet aanmaken onder INBOX\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan geen mailbox maken: LIST mislukt\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "kan geen mailbox maken\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, 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:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "kan de mailbox niet verwijderen\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "kan de envelop niet verkrijgen\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Ophalen van berichtkoppen (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "Er is een fout opgetreden bij het verkrijgen van de envelop.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan de envelop niet verwerken: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, 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:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "kan de NAMESPACE niet vinden\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "Fout bij IMAP-opdracht: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-identificatie mislukt.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login mislukt.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan %s niet toevoegen aan %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(bestand wordt verzonden...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kan bericht niet toevoegen aan %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan %s niet naar %s kopiëren\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fout bij IMAP-opdracht: STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "Fout bij IMAP-opdracht: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
@@ -300,20 +300,20 @@ msgstr "Berichten worden geëxporteerd van %s naar %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "kan bericht niet kopiëren van %s naar %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "de bronmap is hetzelfde als de doelmap.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -322,7 +322,7 @@ msgstr ""
 "Bestand '%s' bestaat al.\n"
 "Kan geen map aanmaken."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -600,12 +600,12 @@ msgstr "  Onderwerp: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Uitgever: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "kan de bestandmodus niet veranderen\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "schrijven naar %s is mislukt.\n"
@@ -691,7 +691,7 @@ msgstr ""
 "u op de knop 'Alles ophalen' klikt."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -826,7 +826,7 @@ msgstr "Gebruikersargumenten voor actie"
 msgid "Add Address to Book"
 msgstr "Adres toevoegen aan adresboek"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
@@ -839,7 +839,7 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Bestand"
@@ -861,9 +861,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Bestand/Nieuwe _LDAP-server"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Bestand/---"
@@ -885,11 +885,11 @@ msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Be_werken/_Kopiëren"
@@ -926,7 +926,7 @@ msgstr "/_Adres/_Bewerken"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Gereedschap"
@@ -935,12 +935,12 @@ msgstr "/_Gereedschap"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
@@ -987,7 +987,7 @@ msgstr "/Be_werken/_Plakken"
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Adresboek"
 
@@ -1053,7 +1053,7 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Verwijder map"
 
@@ -1209,15 +1209,15 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Bericht"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Fout"
 
@@ -1317,7 +1317,7 @@ msgstr "/Be_werken/_Ongedaan maken"
 msgid "/_Edit/_Redo"
 msgstr "/Be_werken/O_pnieuw toepassen"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Be_werken/---"
@@ -1330,7 +1330,7 @@ msgstr "/Be_werken/K_nippen"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Be_werken/Plakken als _citaat"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Be_werken/_Alles selecteren"
 
@@ -1346,7 +1346,7 @@ msgstr "/Be_werken/Regelterugloop in hele bericht"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Be_werken/Regel_terugloop"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/Beel_d"
@@ -1368,9 +1368,9 @@ msgid "/_View/_Reply to"
 msgstr "/Beel_d/Ant_woord naar"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Beel_d/---"
 
@@ -1391,7 +1391,7 @@ msgstr "/Beel_d/_Bijlage"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Beel_d/_Ga naar/Andere _map..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Beel_d/_Tekstcodering"
 
@@ -1402,113 +1402,113 @@ msgstr "/Beel_d/_Tekstcodering/_Automatisch"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Beel_d/_Tekstcodering/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Beel_d/_Tekstcodering/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Beel_d/_Tekstcodering/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Beel_d/_Tekstcodering/Centraaleuropees (ISO-8859-2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Beel_d/_Tekstcodering/Baltisch (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Beel_d/_Tekstcodering/Baltisch (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (Windows-1256)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Beel_d/_Tekstcodering/Grieks (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Beel_d/_Tekstcodering/Arabisch (Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Beel_d/_Tekstcodering/Hebreeuws (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Beel_d/_Tekstcodering/Hebreeuws (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Beel_d/_Tekstcodering/Turks (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (KOI8-_U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Beel_d/_Tekstcodering/Cyrillisch (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Beel_d/_Tekstcodering/Japans (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Beel_d/_Tekstcodering/Vereenvoudigd Chinees (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Beel_d/_Tekstcodering/Vereenvoudigd Chinees (GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Beel_d/_Tekstcodering/Traditioneel Chinees (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Beel_d/_Tekstcodering/Koreaans (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Beel_d/_Tekstcodering/Thais (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Beel_d/_Tekstcodering/Thais (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Gereedschap/_Adresboek"
 
@@ -1516,13 +1516,13 @@ msgstr "/_Gereedschap/_Adresboek"
 msgid "/_Tools/_Template"
 msgstr "/_Gereedschap/_Sjabloon"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Gereedschap/A_cties"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Gereedschap/---"
@@ -1556,70 +1556,70 @@ msgstr "%s: bestand bestaat niet\n"
 msgid "Can't get text part\n"
 msgstr "Kan tekstgedeelte niet ophalen\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Citeerteken opmaakfout."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Bericht beantwoorden/doorsturen opmaakfout."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan de bestandsgrootte niet bepalen van %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Bestand %s is leeg"
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Kan %s niet inlezen."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Bericht opstellen%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Geen onderwerp"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "U heeft geen onderwerp ingevuld. Toch versturen?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "Kan geen ontvangerlijst opvragen."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1627,21 +1627,21 @@ msgstr ""
 "Account voor het verzenden van email is niet gespecificeerd.\n"
 "Selecteer een account voordat u verzend."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Het bericht kan niet opgeslagen worden in de outbox."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Kon gee bijpassende sleutel vinden voor geselecteerde sleutel-id `%s'."
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1652,11 +1652,11 @@ msgstr ""
 "\n"
 "Toch versturen als %s?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Fout bij coderingsconversie"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1669,15 +1669,15 @@ msgstr ""
 "\n"
 "Toch versturen?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Maximale regellengte"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1686,83 +1686,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "kan het oude bericht niet verwijderen\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "bericht wordt in de wachtrij geplaatst...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "kan de Wachtrij-map niet vinden\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "kan het bericht niet in de wachtrij plaatsen\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "gegenereerd bericht-ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Venster \"Bericht opstellen\" wordt aangemaakt...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "Ondertekenen met PGP"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "MIME-type"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Grootte"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "De ingegeven opdracht voor de externe editor is onjuist: '%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1771,48 +1771,48 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -1970,12 +1970,12 @@ msgstr "Map hernoemen"
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -2143,42 +2143,42 @@ msgstr "Kies map"
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Verzonden"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Wachtrij"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan map '%s' niet aanmaken."
@@ -2266,56 +2266,56 @@ msgstr "Mapinfo wordt ingesteld...\n"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Accountlijst verversen"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "De mappenboom zal opnieuw opgebouwd worden. Doorgaan?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Opnieuw opbouwen van de mappenboom mislukt."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Troep"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Map %s is geselecteerd\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Downloaden van berichten in %s ..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Er is een fout opgetreden bij het downloaden van berichten in '%s'."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2325,26 +2325,26 @@ msgstr ""
 "(Als je een map wilt maken om daarin submappen te plaatsen,\n"
 "sluit de naam dan af met een '/')"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan map '%s' niet hernoemen."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan map '%s' niet verplaatsen."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2353,11 +2353,11 @@ msgstr ""
 "Wilt u de zoekmap '%s' verwijderen?\n"
 "De berichten zelf zullen NIET worden verwijderd."
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Zoekmap verwijderen"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2370,20 +2370,20 @@ msgstr ""
 "\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verplaatsen."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2392,34 +2392,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
@@ -2566,143 +2566,143 @@ msgstr "Afronden"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nieuwe berichten"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Bezig met identificatie"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Een ogenblik geduld alstublieft"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Afgebroken"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Bezig met ophalen"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Klaar (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Klaar (geen nieuwe bercihten)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Identificatie mislukt"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Vergrendeld"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Time-out"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Klaar (%d nieuwe bericht(en))"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Klaar (geen nieuwe berichten)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Er is een fout opgetreden bij het ophalen van de e-mail."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "nieuwe berichten voor account %s worden opgehaald...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Bezig met identificatie"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Nieuwe berichten worden opgehaald"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinden met POP3-server: %s ..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan niet verbinden met POP3 server: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Bezig met identificatie..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Berichten ophalen van %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Opvragen van het aantal nieuwe berichten (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Opvragen van het aantal nieuwe berichten (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Opvragen van het aantal nieuwe berichten (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Opvragen van de grootte van de nieuwe berichten (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Bezig met verwijderen van bericht %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Bezig met afsluiten"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Ophalen (%d bericht(en) (%s) ontvangen)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Verbinding mislukt."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2711,29 +2711,29 @@ msgstr ""
 "Fout bij het verwerken van de e-mail:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "De ruimte op de schijf is op."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Het bestand is niet beschrijfbaar."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Socket-fout."
 
 #  consider EOF right after QUIT successful
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Verbinding verbroken door verbindingspartner."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Mailbox is vergrendeld."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2742,11 +2742,11 @@ msgstr ""
 "Mailbox is vergrendeld:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Identificatie mislukt."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2755,15 +2755,15 @@ msgstr ""
 "Identificatie mislukt:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Sessie is verlopen."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "E-mail verwerken geannuleerd\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Nieuwe berichten worden opgehaald van %s naar %s ...\n"
@@ -2897,7 +2897,7 @@ msgstr "Berichten zijn in de wachtrij gezet"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2906,15 +2906,15 @@ msgstr ""
 "OpenPGP ondersteuning wordt uitgeschakeld."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "er draait al een Sylpheed.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Configuratie omzetten"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2922,656 +2922,657 @@ msgstr ""
 "De gevonden configuratie is van een oude versie.\n"
 "Wilt u deze omzetten?"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Bestand/_Map"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Bestand/_Map/Nieuwe map aanmaken..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Bestand/_Map/Map _hernoemen..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Bestand/_Map/Map ver_plaatsen..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Bestand/_Map/Map ver_wijderen"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Bestand/_Postbus"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Bestand/_Postbus/Toevoegen..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Bestand/_Postbus/_Verwijderen"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_Bestand/_Postbus/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Bestand/_Postbus//Nieuwe e-mail _ophalen"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Bestand/_Postbus/Nieuwe e-mail ophalen voor _alle accounts"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Bestand/_Postbus/_Mappenlijst opnieuw opbouwen"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Bestand/Mbox bestand importeren..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Bestand/Mbox bestand _exporteren..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Bestand/Prullenbak _legen"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Bestand/Opslaan _als..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Bestand/Opslaan _als..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Bestand/Af_drukken..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Bestand/Off-line werken"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Bestand/A_fsluiten"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/Be_werken/_Discussie selecteren"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/Be_werken/Zoeken in bericht..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/Be_werken/Berichtenlijst door_zoeken..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/Beel_d/_Hoofdvenster"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Beel_d/_Hoofdvenster/_Accountlijst"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Beel_d/_Hoofdvenster/_Bericht"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/Afbeelding _en tekst"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/_Afbeelding"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/_Afbeelding"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/_Tekst"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Beel_d/_Hoofdvenster/_Werkbalk/_Niet weergeven"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Beel_d/_Hoofdvenster/_Zoekbalk"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Beel_d/_Hoofdvenster/Status_balk"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/Beel_d/_Ga naar/Andere _map..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/Beel_d/Acc_ountlijst los"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/Beel_d/_Bericht los"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/Beel_d/_Sorteren"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/Beel_d/_Sorteren/Op _nummer"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Beel_d/_Sorteren/Op _grootte"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/Beel_d/_Sorteren/Op _datum"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Beel_d/_Sorteren/Op datum (dis_cussie)"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/Beel_d/_Sorteren/Op _afzender"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Beel_d/_Sorteren/Op _ontvanger"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/Beel_d/_Sorteren/Op _onderwerp"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/Beel_d/_Sorteren/Op _kleurlabel"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/Beel_d/_Sorteren/Op _markering"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/Beel_d/_Sorteren/Op on_gelezen"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Beel_d/_Sorteren/Op _bijvoeging"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Beel_d/_Sorteren/_Ongesorteerd"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/Beel_d/_Sorteren/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/Beel_d/_Sorteren/Oplopend"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/Beel_d/_Sorteren/Aflopend"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Beel_d/_Sorteren/Aantrekken op onderwerp"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/Beel_d/Ge_nest"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/Beel_d/Discussies _uitklappen"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/Beel_d/Discussies _inklappen"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/Beel_d/_Kolommen berichtenlijst..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/Beel_d/_Ga naar"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Beel_d/_Ga naar/_Vorige bericht"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/Beel_d/_Ga naar/Vo_lgende bericht"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/Beel_d/_Ga naar/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Beel_d/_Ga naar/Vo_rige ongelezen bericht"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Beel_d/_Ga naar/Volgende on_gelezen bericht"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Beel_d/_Ga naar/_Vorige nieuwe bericht"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Beel_d/_Ga naar/Vo_lgende nieuwe bericht"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Beel_d/_Ga naar/Vorige ge_markeerd bericht"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Beel_d/_Ga naar/Volgende gem_arkeerd bericht"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Beel_d/_Ga naar/Vorige gela_beld bericht"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Beel_d/_Ga naar/Volgende gelab_eld bericht"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Beel_d/_Ga naar/Andere _map..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Beel_d/_Tekstcodering/Automatisch"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Beel_d/_Tekstcodering/Westeuropees (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Beel_d/_Tekstcodering/Japans (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Beel_d/_Tekstcodering/Japans (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Beel_d/_Tekstcodering/Japans (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Beel_d/_Tekstcodering/Traditioneel Chinees (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Beel_d/_Tekstcodering/Chinees (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Beel_d/_Tekstcodering/Koreaans (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/Beel_d/In _nieuw venster openen"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/Beel_d/_Broncode weergeven"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Beel_d/Vo_lledige header"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/Beel_d/_Verversen"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/Be_richt"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/Be_richt/_Ophalen"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Be_richt/_Ophalen/E-mail van _huidig account ophalen"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Be_richt/_Ophalen/Alle e-mail ophalen"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/Be_richt/_Ophalen/Ophalen afbreken"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/Be_richt/_Ophalen/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/Be_richt/Berichten uit wachtrij verzenden"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/Be_richt/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/Be_richt/_Nieuw bericht opstellen"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/Be_richt/_Beantwoorden"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/Be_richt/Antwoord _sturen aan"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Be_richt/Antwoord _sturen aan/_iedereen"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Be_richt/Antwoord _sturen aan/_afzender"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Be_richt/Antwoord _sturen aan/_discussielijst"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/Be_richt/_Doorsturen"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/Be_richt/Doorsturen _als bijlage"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/Be_richt/Om_leiden"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/Be_richt/_Verplaatsen..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/Be_richt/_Kopiëren..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/Be_richt/_Markeren"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Be_richt/_Markeren/_Markeren"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Be_richt/_Markeren/_Demarkeren"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/Be_richt/_Markeren/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Be_richt/_Markeren/Als _ongelezen"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Be_richt/_Markeren/Als _gelezen"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Be_richt/_Markeren/Als _gelezen (discussie)"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Be_richt/_Markeren/_Alles gelezen"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/Be_richt/Ver_wijderen"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/Be_richt/Als _troep markeren"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Be_richt/Als _geen troep markeren"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/Be_richt/Bewerken"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Gereedschap/Af_zender toevoegen aan adresboek..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Gereedschap/Alle berichten _filteren"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Gereedschap/_Geselecteerde berichten filteren"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Gereedschap/Filterregel _aanmaken"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Gereedschap/_Creëer Filterregel/_Automatisch"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Gereedschap/_Creëer filterregel/voor A_fzender"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Geadresseerde"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Gereedschap/_Creëer filterregel/voor _Onderwerp"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Gereedschap/_Troep filteren"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Gereedschap/Troep filteren uit ge_selecteerde berichten"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Gereedschap/Du_bbele berichten verwijderen"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Voer de gemarkeerde acties uit"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Gereedschap/_Logboek"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Instellingen"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Instellingen/Algemene voorkeuren..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Instellingen/_Filterbeheer..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Instellingen/_Sjabloonbeheer..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Instellingen/A_cties..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Instellingen/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Instellingen/Accountvoorkeuren..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Instellingen/Nieuw account aanmaken..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Instellingen/Accountbeheer..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Instellingen/Huidig account veranderen"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Hulp/_Handboek"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hulp/_Handboek/_Engels"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hulp/_Handboek/_Japans"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/_Hulp/_FAQ"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hulp/_FAQ/_Engels"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hulp/_FAQ/_Duits"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hulp/_FAQ/_Spaans"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hulp/_FAQ/_Frans"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hulp/_FAQ/_Italiaans"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/_Hulp/Opties voor de opdrachtregel"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Hulp/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Hoofdvenster wordt aangemaakt...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "klaar.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Geen titel"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "niets"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Vensterscheidingstype wordt gewijzigd van %d naar %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Off-line"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "U bent off-line aan het werken. Wilt u on-line gaan?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Prullenbakken legen"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Alle berichten uit de prullenbakken weggooien?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Mailbox toevoegen"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3581,16 +3582,16 @@ msgstr ""
 "Als een bestaande postbus wordt ingevuld,\n"
 "dan wordt hij automatisch ingelezen."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3600,71 +3601,71 @@ msgstr ""
 "Misschien bestaan er al wat bestanden, of heb je geen toestemming om er te "
 "schrijven."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappenoverzicht"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/_Iedereen beantwoorden"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/_Afzender beantwoorden"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/_Discussielijst beantwoorden"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 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:2837
+#: src/mainwindow.c:2849
 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:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Afsluiten"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Sylpheed afsluiten?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Opties voor de opdrachtregel"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Gebruik: Sylpheed [OPTIES]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3692,7 +3693,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3924,7 +3925,7 @@ msgstr "Account%d"
 msgid "Preferences for new account"
 msgstr "Voorkeuren voor nieuw account"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Accountvoorkeuren"
 
@@ -3937,7 +3938,7 @@ msgid "Receive"
 msgstr "Ontvangen"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Verzenden"
 
@@ -4151,7 +4152,7 @@ msgstr "Identificatie met POP3 voor het verzenden"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Tekenen"
 
@@ -4611,7 +4612,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Editor"
 
@@ -5724,7 +5725,7 @@ msgstr ""
 "[...] of (...) verwijderen aan het begin van het onderwerp bij beantwoorden"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
@@ -5938,80 +5939,90 @@ msgstr "Afdrukken"
 msgid "Print message"
 msgstr "Verzend bericht"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Stap"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Server om van te ontvangen"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Voer de gemarkeerde acties uit"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Voork."
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Verzend bericht"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Wachtrij"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "In de wachtrij plaatsen en later verzenden"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Klad"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Opslaan als klad"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Invoegen"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Bestand invoegen"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Bijvoegen"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Handtekening toevoegen"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Bewerken met ander (extern) programma"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Terugloop"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Lange regels op meerdere regels zetten"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/Beel_d/_Ga naar/Andere _map..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6264,7 +6275,7 @@ msgstr "Geen hadtekening gevonden"
 msgid "Good signature from \"%s\""
 msgstr "Goedgekeurde handtekening van \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Correcte handtekening"
 
@@ -6273,7 +6284,7 @@ msgstr "Correcte handtekening"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Geldige ondertekening maar de sleutel voor \"%s\" wordt niet vertrouwd"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Geldige ondertekening (onbetrouwbare sleutel)"
 
@@ -6309,7 +6320,7 @@ msgstr "Geldige ondertekening maar de sleutel is verlopen"
 msgid "BAD signature from \"%s\""
 msgstr "SLECHTE handtekening van \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "FOUTIEVE handtekening"
 
@@ -6757,41 +6768,45 @@ msgstr "bestand %s bestaat al\n"
 msgid "Creating text view...\n"
 msgstr "Tekstvenster wordt aangemaakt...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Dit bericht kan niet worden weergegeven.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "Afbeelding opslaan _als..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "_Nieuw bericht opstellen"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Toevoegen aan _adresboek"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "_Adres kopiëren"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "Openen met webbrowser"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "_Link kopiëren"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6804,7 +6819,7 @@ msgstr ""
 "\n"
 "Wilt u het toch openen?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Waarschuwing! Misleidende link"
 
diff --git a/po/pl.po b/po/pl.po
index ff4d3fcb..7375d579 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2005-03-05 18:57+0100\n"
 "Last-Translator: Wit Wilinski <madman at linux dot bydg dot org>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -50,162 +50,162 @@ msgstr "Wysyłanie wiadomości (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Pobieranie wiadomości z %s..."
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nie można ustawić flag skasowany: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "nie można zlikwidować\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Pobieranie wiadomości z %s..."
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nie można ustawić flagi skasowany: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "nie można zamknąć katalogu\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "brak głównego katalogu %s\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "wystąpił błąd podczas przy pobieraniu LIST.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "nie można utworzyć \"%s\"\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "nie można utworzyć \"%s\" w INBOX\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nie można utworzyć skrzynki: błąd LIST.\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "nie można utworzyć skrzynki\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, 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:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "nie można skasować skrzynki\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "nie można pobrać koperty\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Wysyłanie wiadomości (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "wystąpił błąd podczas pobierania koperty.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nie można przetworzyć koperty: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, 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:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "nie można pobrać przestrzeni nazw\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nie można wybrać katalogu: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: CLOSE\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "Błąd uwierzytelniania IMAP4.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "Nie można zalogować się do serwera IMAP4.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nie można dołączyć %s do %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(wysyłanie pliku...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nie można dołączyć wiadomości do %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nie można skopiować %s do %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, 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:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, 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:4156
+#: libsylph/imap.c:4151
 #, 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"
@@ -297,20 +297,20 @@ msgstr "Eksportowanie wiadomości z %s do %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "nie można skopiować wiadomości %s do %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Nie można otworzyć pliku zaznaczeń.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "katalog źródłowy jest taki sam jak docelowy.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -319,7 +319,7 @@ msgstr ""
 "Plik \"%s\" już istnieje.\n"
 "Nie można utworzyć katalogu."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -590,12 +590,12 @@ msgstr "Temat: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Nadawca: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "nie można zmienić trybu pliku\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "błąd zapisu do %s.\n"
@@ -680,7 +680,7 @@ msgstr ""
 "w kolumnie \"G\" konta, które mają być sprawdzone przez 'Odbierz wsz.'"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -816,7 +816,7 @@ msgstr "Argumenty użytkownika dla akcji"
 msgid "Add Address to Book"
 msgstr "Dodaj do książki adresowej"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
@@ -829,7 +829,7 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Plik"
@@ -852,9 +852,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Plik/Nowy _Serwer"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Plik/---"
@@ -876,11 +876,11 @@ msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
@@ -917,7 +917,7 @@ msgstr "/_Adres/_Edycja"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Narzędzia"
@@ -926,12 +926,12 @@ msgstr "/_Narzędzia"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
@@ -978,7 +978,7 @@ msgstr "/_Edycja/_Wstaw"
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Książka adresowa"
 
@@ -1044,7 +1044,7 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
@@ -1204,15 +1204,15 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Notatka"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Błąd"
 
@@ -1313,7 +1313,7 @@ msgstr "/_Edycja/_Cofnij"
 msgid "/_Edit/_Redo"
 msgstr "/_Edycja/Po_nów"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Edycja/---"
@@ -1326,7 +1326,7 @@ msgstr "/_Edycja/Wy_tnij"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Edycja/Wstaw jako c_ytat"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Edycja/W_ybierz wszystko"
 
@@ -1342,7 +1342,7 @@ msgstr "/_Edycja/Zawijaj wszystkie długie _linie"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Edycja/Aut_o-zawijanie"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Widok"
@@ -1364,9 +1364,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Widok/_Odpowiedz do"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Widok/---"
 
@@ -1387,7 +1387,7 @@ msgstr "/_Widok/Załączniki"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
@@ -1398,115 +1398,115 @@ msgstr "/_Widok/Kodowani_e znaków/Automatyczne"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Widok/Kodowani_e znaków/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Widok/Kodowani_e znaków/7-bitowe ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Widok/Kodowani_e znaków/Unikod (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Środkowa (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Widok/Kodowani_e znaków/_Bałtyckie (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Widok/Kodowani_e znaków/Greckie (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Widok/Kodowani_e znaków/Bałtyckie (ISO-8859-_4)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Widok/Kodowani_e znaków/Hebrajskie (Windows-1251)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Widok/Kodowani_e znaków/Tureckie (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (KOI8-U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Widok/Kodowani_e znaków/Cyrylica (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Widok/Kodowani_e znaków/Uproszczone Chińskie (GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Widok/Kodowani_e znaków/Tajskie (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Narzędzia/_Książka adresowa"
 
@@ -1514,13 +1514,13 @@ msgstr "/_Narzędzia/_Książka adresowa"
 msgid "/_Tools/_Template"
 msgstr "/_Narzędzia/_Szablon"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzędzia/Polecen_ia"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Narzędzia/---"
@@ -1556,71 +1556,71 @@ msgstr "%s: brak pliku\n"
 msgid "Can't get text part\n"
 msgstr "Nie mogę pobrać części tekstu\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Błąd formatu znacznika cytatu."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Błąd formatu odpowiedz/przekaż wiadomość."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Plik %s nie istnieje\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nie można odczytać wielkości pliku %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Nie można odczytać %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Utwórz wiadomość%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 #, fuzzy
 msgid "Empty subject"
 msgstr "Temat"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Wiadomość nie posiada tematu. Czy wysłać ją mimo tego ?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "nie można pobrać listy odbiorców."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1628,22 +1628,22 @@ msgstr ""
 "Nie podano konta pocztowego do wysyłania wiadomości.\n"
 "Należy wybrać konto przed wysłaniem."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Błąd podczas wysyłania wiadomości do %s."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Nie można zapisać wiadomości do outbox."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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:3027
+#: src/compose.c:3035
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1653,12 +1653,12 @@ msgstr ""
 "Nie można przekonwertować treści wiadomości z %s na %s.\n"
 "Wysłać wiadomość mimo to %s ?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1667,15 +1667,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1684,83 +1684,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "Nie można usunąć starej wiadomości\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "kolejkowanie wiadomości...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "nie można znaleźć katalogu kolejki\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "nie można zapisać wiadomości do kolejki\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "wygenerowany Message-ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Tworzenie okna edycji...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "typ MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1770,51 +1770,51 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 #, fuzzy
 msgid "Save message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamień"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Insert"
 msgstr "Wstaw"
@@ -1972,12 +1972,12 @@ msgstr "Edytuj katalog"
 msgid "Input the new name of folder:"
 msgstr "Podaj nową nazwę katalogu:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
@@ -2145,42 +2145,42 @@ msgstr "Wybierz katalog"
 msgid "Select folder"
 msgstr "Wybierz katalog"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Wysłane"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kolejka"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Śmietnik"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Szablony"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "Nowy katalog"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie może wystąpić w nazwie katalogu."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' już istnieje."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie można utworzyć katalog '%s'."
@@ -2270,56 +2270,56 @@ msgstr "Ustawianie informacji o katalogu...\n"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Odbuduj drzewo katalogów"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Drzewo katalogów zostnie przebudowane. Kontynuować?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Odbudowywanie drzewa katalogów..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Błąd podczas odbudowywania drzewa katalogów."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Wybrano katalog %s\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Błąd podczas pobierania wiadomości z `%s'."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2329,26 +2329,26 @@ msgstr ""
 "(jeśli ma zostać utworzony katalog w celu przechowywania\n"
 "innych wiadomości, należy dołączyć \"/\" na końcu nazwy)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowadź nową nazwę dla '%s' :"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Zmień nazwę katalogu"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2357,12 +2357,12 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Usuń katalog"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2373,21 +2373,21 @@ msgstr ""
 "Wszystkie katalogi i wiadomości w \"%s\" zostaną usunięte.\n"
 "Czy naprawdę chcesz je usunąć?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2396,34 +2396,34 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Usuń konto IMAP4"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawdę chcesz usunąć grupę dyskusyjną \"%s\"?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Usuń grupę dyskusyjną"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Usuń konto grup dyskusyjnych"
 
@@ -2569,143 +2569,143 @@ msgstr "Koniec"
 msgid "Sylpheed: %d new messages"
 msgstr "Zakończono (%d nowe wiadomości)"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Uwierzytelnianie"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Pobieranie nowych wiadomości"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Oczekiwanie"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Pobieranie"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gotowe (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Gotowe (brak nowych wiadomości)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Błąd połączenia"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Błąd autoryzacji"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Zablokowano"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Opóźnienie"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Zakończono (%d nowe wiadomości)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Zakończono (brak nowych wiadomości)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Wystąpiły błędy podczas pobierania poczty."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "pobieranie nowych wiadomości z konta %s ...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Uwierzytelnianie"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Pobieranie nowych wiadomości"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Nawiązywanie połączenia z serwerem POP3: %s..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nie można nawiązać połączenia z serwerem POP3: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby nowych wiadomości (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby nowych wiadomości (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby nowych wiadomości (UIDL)"
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie rozmiaru wiadomości (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Usuwanie wiadomości %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Wychodzenie"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Pobieranie (%d wiadomośći (%s) odebrano)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Błąd połączenia."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2714,28 +2714,28 @@ msgstr ""
 "Błąd podczas przetwarzania wiadomości:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Nie można zapisać pliku."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Błąd gniazda."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Połączenie zamknięte przez zdalny komputer."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Skrzynka jest zablokowana."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2744,11 +2744,11 @@ msgstr ""
 "Skrzynka jest zablokowana:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2757,15 +2757,15 @@ msgstr ""
 "Błąd uwierzytelniania:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Sesja wygasła."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Odbieranie anulowano\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobieranie wiadomości z %s do %s...\n"
@@ -2888,7 +2888,7 @@ msgstr "Skolejkowane wiadomości"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Niektóre niewysłane wiadomości zostały skolejkowane. Czy wyjść?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2897,681 +2897,682 @@ msgstr ""
 "wersja jest zbyt stara. Obsługa OpenPGP została wyłączona."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "Jest już uruchomiona kopia programu Sylpheed.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Migracja ustawień"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Plik/_Katalog"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Plik/_Katalog/Utwórz _nowy katalog..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Plik/_Katalog/_Zmień nazwę katalo_gu..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Plik/_Katalog/_Zmień nazwę katalo_gu..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Plik/_Katalog/_Usuń kata_log"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Plik/S_krzynka"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Plik/S_krzynka/Dod_aj skrzynkę..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Usuń _skrzynkę"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_Plik/S_krzynka/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Plik/S_krzynka/Sprawdź nowe wiadomoś_ci"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Plik/S_krzynka/Sprawdź wiadomoś_ci we wszystkich skrzynkach"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Plik/S_krzynka/Odbuduj drz_ewo katalogów"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Plik/_Importuj plik mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Plik/_Eksportuj do pliku mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Plik/Opróżnij śmie_tnik"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Plik/Zapi_sz jako..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Plik/Zapi_sz jako..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Plik/_Drukuj..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Plik/Praca _offline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Plik/_Koniec"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Edycja/Wybierz wą_tek"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edycja/Zna_jdź w bieżącej wiadomości..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Edycja/Wy_szukaj wiadomości..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Widok/Wyświetl lub _ukryj"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Drzewo katalogów"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Widok/Wyświetl lub _ukryj/Widok wiado_mości"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 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:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Ikony"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Ikony"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/_Tekst"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Widok/Wyświetl lub _ukryj/_Pasek narzędzi/Żade_n"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Widok/Wyświetl lub _ukryj/Pa_sek stanu"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Widok/Wyświetl lub _ukryj/Pa_sek stanu"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Widok/_Oddzielne drzewo katalogów"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/_Widok/Oddzielny widok wiado_mości"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Widok/_Sortuj"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Widok/_Sortuj/wg _numeru"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Widok/_Sortuj/wg w_ielkości"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Widok/_Sortuj/wg _daty"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Widok/_Sortuj/wg _daty"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Widok/_Sortuj/wg pola _od"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Widok/_Sortuj/wg odbio_rcy"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Widok/_Sortuj/wg _tematu"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Widok/_Sortuj/wg _kolorów etykiet"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Widok/_Sortuj/wg _zaznaczeń"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Widok/_Sortuj/wg _nieprzeczytanych"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Widok/_Sortuj/wg z_ałączników"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Widok/_Sortuj/Nie s_ortuj"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Widok/_Sortuj/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Widok/_Sortuj/Rosnąco"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Widok/_Sortuj/Malejąco"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Widok/_Sortuj/_Grupuj wg tematu"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Widok/Widok wą_tków"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Widok/_Rozwiń wszystkie wątki"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Widok/_Zwiń wszystkie wątki"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Widok/Ustaw wyświetlane _elementy..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Widok/_Idź do"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Widok/_Idź do/_Poprzednia wiadomość"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Widok/_Idź do/_Następna wiadomość"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Widok/_Idź do/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Widok/_Idź do/Poprzednia niep_rzeczytana wiadomość"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Widok/_Idź do/Następna ni_eprzeczytana wiadomość"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Widok/_Idź do/_Poprzednia wiadomość"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Widok/_Idź do/_Następna nowa wiadomość"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Widok/_Idź do/Poprzednia zaznaczona wiado_mość"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Widok/_Idź do/Następna z_aznaczona wiadomość"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Widok/_Idź do/_Poprzednia etykietowana wiadomość"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Widok/_Idź do/_Następna etykietowana wiadomość"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Widok/Kodowani_e znaków/_Automatyczne"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Widok/Kodowani_e znaków/Europa Zachodnia (ISO-8859-15)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Widok/Kodowani_e znaków/Japońskie (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Widok/Kodowani_e znaków/Tradycyjne Chińskie (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Widok/Kodowani_e znaków/Chińskie (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/W_Widok/Ot_wórz w nowym oknie"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Widok/P_okaż źródło"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Widok/Wszystkie na_główki"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Widok/_Odśwież podsumowanie"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Wiadomość"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/Wiado_mość/Odbier_z"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Wiado_mość/Odbier_z/Pobierz z bieżą_cego konta"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Wiado_mość/Odbier_z/Pobierz ze _wszystkich kont"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Wiadomość/Odbier_z/Anuluj pob_ieranie"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/Wiado_mość/Odbier_z/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/Wiado_mość/Wyślij wia_domości z kolejki"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Wiadomość/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/Wiado_mość/Twórz _nową wiadomość"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/Wiado_mość/_Odpowiedz"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/Wiado_mość/Odpowied_z"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Wiado_mość/Odpowied_z/w_szystkim"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Wiado_mość/Odpowied_z/nadawc_y"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Wiado_mość/Odpowiedz/_liście dyskusyjnej"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/Wiado_mość/Przekaż da_lej"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/Wiado_mość/Przekaż j_ako załącznik"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/Wiado_mość/Prze_kieruj"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/Wiado_mość/_Przesuń..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/Wiado_mość/_Kopiuj"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/Wiado_mość/_Zaznacz"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Wiado_mość/_Zaznacz/_Zaznacz"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/Wiado_mość/_Zaznacz/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako ni_eprzeczytane"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako przecz_ytane"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz jako przecz_ytane"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Wiado_mość/_Zaznacz/Zaznacz wszystkie jako przecz_ytane"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/Wiado_mość/_Usuń"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Wiado_mość/_Zaznacz/_Odznacz"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/Wiado_mość/Prz_eedytuj"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Narzędzia/Dodaj nadawcę do _książki adresowej"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Automatycznie"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Od"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Do"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Temat"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Narzędzia/_Filtruj wiadomości w katalogu"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Narzędzia/Filtruj zaznaczonne wiadomości"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Wiado_mość/Usuń z_duplikowane wiadomości"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Narzędzia/Okno _logów"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/Konfigura_cja"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Konfigura_cja/Preferen_cje..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Konfigura_cja/Ustawienia _filtrowania"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/Konfigura_cja/_Szablon..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/Konfigura_cja/Poleceni_a..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/Konfigura_cja/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Konfigura_cja/_Preferencje bieżącego konta..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/Konfigura_cja/Utwórz _nowe konto..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Konfigura_cja/_Edytuj konta..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/Konfigura_cja/Zmień bieżą_ce konto"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Pomoc/_Podręcznik"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoc/_Podręcznik/Angi_elski"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoc/_Podręcznik/_Japoński"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/Pomo_c/_FAQ"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoc/_FAQ/Angi_elskie"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoc/_FAQ/_Niemieckie"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoc/_FAQ/Hi_szpańskie"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoc/_FAQ/_Francuskie"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoc/_FAQ/_Włoskie"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Nie ustawiono polecenia."
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Pomoc/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Tworzenie głównego okna...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "gotowe.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Bez tytułu"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "żaden"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Zmiana typu rozdzielania okna z %d na %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Offline"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Jesteś offline. Przejść do trybu online?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkę"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3582,16 +3583,16 @@ msgstr ""
 "Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
 "automatycznie skanowana."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3601,69 +3602,69 @@ msgstr ""
 "Być może pliki już istnieją lub brak jest wystarczających uprawnień do "
 "zapisu w tym miejscu."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Widok Katalogów"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Odpowiedz wszystkim"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Odpowiedz nadawcy"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _liście dyskusyjnej"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr "Jesteś offline. Kliknij ikonę by przejść do trybu online."
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "Jesteś online. Kliknij ikonę, by przejść do trybu offline."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Koniec programu"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Czy zakończyć program?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 #, fuzzy
 msgid "Command line options"
 msgstr "Nie ustawiono polecenia."
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3679,7 +3680,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3899,7 +3900,7 @@ msgstr "Konto%d"
 msgid "Preferences for new account"
 msgstr "Preferencje nowego konta"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Preferencje konta"
 
@@ -3912,7 +3913,7 @@ msgid "Receive"
 msgstr "Odbieranie"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Wyślij"
 
@@ -4133,7 +4134,7 @@ msgstr "Uwierzytelnianie POP3 przed wysyłaniem"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Podpis"
 
@@ -4595,7 +4596,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Edytor"
 
@@ -5723,7 +5724,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Usuń [...] lub (...) z początku tematu przy odpowiedzi"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
@@ -5939,81 +5940,91 @@ msgstr "Drukuj"
 msgid "Print message"
 msgstr "Wyślij wiadomość"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Krok"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Serwer dla odbioru"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Wykonaj zaznaczony proces"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Preferencje"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Wspólne preferencje "
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Wyślij wiadomość"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Wyślij później"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Umieść w katalogu kolejki i wyślij później"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Draft"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Wstaw"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Wstaw plik"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Dołącz"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Dołącz plik"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 #, fuzzy
 msgid "Append signature"
 msgstr "ZŁY podpis"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Edytuj w zewnętrznym edytorze"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Zawijanie linii"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Zawijaj wszystkie długie linie"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Widok/Idź do inne_go katalogu..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6267,7 +6278,7 @@ msgstr "Nie znaleziono podpisu"
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis od \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Poprawny podpis"
 
@@ -6276,7 +6287,7 @@ msgstr "Poprawny podpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6312,7 +6323,7 @@ msgstr "Podpis poprawny, ale klucz został unieważniony"
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis od \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "ZŁY podpis"
 
@@ -6787,45 +6798,49 @@ msgstr "plik %s już istnieje\n"
 msgid "Creating text view...\n"
 msgstr "Tworzenie widoku tekstowego...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Ta wiadomość nie może zostać wyświetlona.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "Zapi_sz grafikę jako..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dodaj nadawcę do _książki adresowej"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Przeglądarka Web"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6834,7 +6849,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3f4cddd0..c9840955 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2007-03-01 15:01-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -59,161 +59,161 @@ msgstr "Adicionando mensagens em %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "Movendo mensagens %s para %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensagesn %s para %s ..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Removendo mensagens %s"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "não posso marcar como apagado: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "não posso eliminar\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Removendo todas as mensagens em %s"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "não posso marcar como apagado: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "não posso fechar pasta\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "pasta raiz %s inexistente\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "erro recebendo resultados do LIST.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Não foi possível criar '%s'\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, 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:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "não posso criar caixa de correio: LIST falhou\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "não posso criar caixa de correio\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, 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:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "não posso apagar caixa de correio\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "Não foi possível obter o 'envelope'\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Buscando cabeçalhos das mensagens (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "Ocorreu um erro ao obter 'envelope'\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, 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:2537
+#: libsylph/imap.c:2532
 #, 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:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "Não foi possível obter o 'envelope'\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não posso selecionar pasta: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "erro no comando imap: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "Falha na autenticação IMAP4.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "Falha ao logar no servidor IMAP4.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, 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:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(enviando arquivo...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "não foi possível anexar a mensagem em %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "não posso copiar %s para %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erro no comando imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, 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:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "o iconv não pode converter %s para UTF-7\n"
@@ -305,20 +305,20 @@ msgstr "Exportando mensagens de %s em %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "não foi possível copiar a mensagem %s para %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Não foi possível abrir o arquivo de marcas.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "pastas de origem e destino são idênticas.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiando mensagem %s%c%d para %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -327,7 +327,7 @@ msgstr ""
 "O arquivo `%s' já existe.\n"
 "Não foi possível criar a pasta."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -602,12 +602,12 @@ msgstr "  Assunto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "Emissor: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "erro ao gravar em %s.\n"
@@ -690,7 +690,7 @@ msgstr ""
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -825,7 +825,7 @@ msgstr "Argumento do usuário para a ação"
 msgid "Add Address to Book"
 msgstr "Adicionar ao Catálogo de Endereços"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Endereço"
 
@@ -838,7 +838,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Catálogo de Endereços"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arquivo"
@@ -860,9 +860,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Arquivo/Novo Servidor _LDAP"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
@@ -884,11 +884,11 @@ msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
@@ -925,7 +925,7 @@ msgstr "/_Endereço/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -934,12 +934,12 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
@@ -984,7 +984,7 @@ msgstr "/Co_lar"
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
@@ -1048,7 +1048,7 @@ msgstr ""
 "Você quer apagar a pasta E todos os endereços em `%s' ?\n"
 "Caso apague somente a pasta, os endereços serão movidos para a pasta pai."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
@@ -1206,15 +1206,15 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Notificação"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Erro"
 
@@ -1314,7 +1314,7 @@ msgstr "/_Editar/_Desfazer"
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refazer"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
@@ -1327,7 +1327,7 @@ msgstr "/_Editar/_Cortar"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Colar como ci_tação"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Selecionar tudo"
 
@@ -1343,7 +1343,7 @@ msgstr "/_Editar/Quebrar todas as _linhas compridas"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Quebra automática de linha"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/E_xibir"
@@ -1365,9 +1365,9 @@ msgid "/_View/_Reply to"
 msgstr "/E_xibir/_Responder para"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/E_xibir/---"
 
@@ -1387,7 +1387,7 @@ msgstr "/E_xibir/_Anexo"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/E_xibir/Cu_stomizar barra de ferramentas..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação de caracteres"
 
@@ -1398,112 +1398,112 @@ msgstr "/E_xibir/Codificação de caracteres/_Automático"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação de caracteres/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 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:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_/Codificação de caracteresUnicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/E_xibir/_Codificação de caracteres/Europa Ocidental (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/E_xibir/_Codificação de caracteres/Europa Ocidental (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/E_xibir/_/Codificação de caracteres/Europa Central (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/E_xibir/_Codificação de caracteres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (Windows-1257)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/E_xibir/_Codificação de caracteres/Grego (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/E_xibir/_Codificação de caracteres/Arábico (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/E_xibir/_Codificação de caracteres/Arábico (Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/E_xibir/_Codificação de caracteres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Catálogo de endereços"
 
@@ -1511,13 +1511,13 @@ msgstr "/_Ferramentas/_Catálogo de endereços"
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
@@ -1551,70 +1551,70 @@ msgstr "%s: o arquivo não existe\n"
 msgid "Can't get text part\n"
 msgstr "Não foi possível obter o texto\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Erro no formato de marca de citação."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Erro no formato de mensagem de resposta/encaminhada."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "O arquivo %s não existe\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Não foi possível especificar o tamanho de %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) dessa mensagem."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compondo%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Destinatário não especificado."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Sem assunto"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Assunto em branco. Enviar assim mesmo?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "não pude obter a lista de destinatários."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1622,21 +1622,21 @@ msgstr ""
 "Conta para envio de mensagem não foi especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Não foi possível armazenar a mensagem na caixa de saída."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Não foi possível obter nenhuma chave associada ao ID selecionado '%s'."
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1648,11 +1648,11 @@ msgstr ""
 "\n"
 "Enviar como %s mesmo assim?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Erro convertendo codificação"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1665,15 +1665,15 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Limite de comprimento da linha"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr "Encriptando com Bcc"
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1687,83 +1687,83 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "não posso remover a mensagem antiga\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "enfileirando mensagem...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "não foi possível encontrar a pasta da fila\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "não foi possível enfileirar a mensagem\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID gerado: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "Assinar (PGP)"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, 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:5724
+#: src/compose.c:5732
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1772,48 +1772,48 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr "_Customizar barra de ferramentas..."
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensagem foi modificada. Salvá-la na pasta de rascunhos?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -1971,12 +1971,12 @@ msgstr "Editar pasta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -2145,42 +2145,42 @@ msgstr "Selecionar diretório"
 msgid "Select folder"
 msgstr "Selecione uma pasta"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviadas"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Fila de saída"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' não pode ser usado no nome da pasta."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "A pasta `%s' já existe."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "não foi possível criar a pasta `%s'."
@@ -2267,56 +2267,56 @@ msgstr "Configurando informações da pasta...\n"
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "/_Atualizar árvore de pastas"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A árvore de pastas será reconstruída. Continuar?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Atualizando visualizador de pasta..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Falha ao tentar reconstruir a árvore de pastas."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Checar novas mensagens em todas as pastas..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pasta %s selecionada\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Recebendo mensagens em %s ..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Erro ao receber mensagens em `%s'."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2326,26 +2326,26 @@ msgstr ""
 "(se você quer criar uma pasta para armazenar subpastas.\n"
 " adicione `/' no final do nome)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Não foi possível renomear a pasta '%s'."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Não foi possível mover a pasta `%s'."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2354,11 +2354,11 @@ msgstr ""
 "Apagar a pasta de busca '%s' ?\n"
 "As mensagens reais não serão apagadas."
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Apagar pasta de busca"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2371,20 +2371,20 @@ msgstr ""
 "\n"
 "Quer realmente apagá-las?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível excluir a pasta `%s'."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Apagar todas as mensagens da lixeira?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2393,34 +2393,34 @@ msgstr ""
 "Realmente remover a caixa de correio `%s' ?\n"
 "(As mensagens NÃO são apagadas do disco)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Realmente apagar conta IMAP4 `%s' ?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Apagar conta IMAP4"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Apagar grupo de notícias"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Apagar conta de grupo de notícias"
 
@@ -2567,142 +2567,142 @@ msgstr "Terminar"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d novas mensagens"
 
-#: src/inc.c:478
+#: src/inc.c:481
 msgid "Authenticating with POP3"
 msgstr "Autenticando via POP3"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Obtendo novas mensagens"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Aguardando"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Recuperando"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Concluído (%d mensagen(s) (%s) recebida(s))"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Feito (Não há mensagens novas)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Autenticação falhou"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Travado"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Tempo limite"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Concluído (%d nova(s) mensagem(ns))"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Concluído (Não há mensagens novas)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Alguns erros aconteceram ao baixar os emails."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obtendo novas mensagens da conta %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autenticando via POP3"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando novas mensagens"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando ao servidor POP3: %s..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível se conectar ao servidor POP3: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recebendo mensagens de %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtendo o número de novas mensagens (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtendo o número de novas mensagens (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtendo o número de novas mensagens (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o número de novas mensagens (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Apagando mensagem %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Saindo"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Baixando mensagem (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Recebendo (%d mensagem(ns) (%s) recebido)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Falha na conexão"
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2711,28 +2711,28 @@ msgstr ""
 "Erro ao processar mensagens:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Não há espaço disponível no disco."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Não foi possível gravar o arquivo."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "erro de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Conexão remota finalizada pela estação remota."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Caixa de correio está travada."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2741,11 +2741,11 @@ msgstr ""
 "Caixa de correio está trancada:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2754,15 +2754,15 @@ msgstr ""
 "Falha de autenticação:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Tempo limite da sessão."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Incorporação cancelada\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obtendo novas mensagens de %s até %s...\n"
@@ -2894,7 +2894,7 @@ msgstr "Mensagens enviadas para a fila"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Algumas mensagens não enviadas estão na fila. Sair agora?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2903,15 +2903,15 @@ msgstr ""
 "Suporte a OpenPGP desabilitado."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "outra cópia do Sylpheed já está sendo executada.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Migração da configuração"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2919,651 +2919,652 @@ msgstr ""
 "As configurações antigas foram encontradas.\n"
 "Deseja migrar para o novo formato?"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Arquivo/_Pasta"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "_Arquivo/_Pasta/Criar _nova pasta ..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Arquivo/_Pasta/_Renomear pasta..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Arquivo/_Pasta/_Mover pasta..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Arquivo/_Pasta/A_pagar pasta"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Arquivo/_Caixa de correio"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Arquivo/_Caixa de correio/_Adicionar caixa de correio..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Arquivo/_Caixa de correio/Remover _caixa de correio"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_Arquivo/_Caixa de correio/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Arquivo/_Caixa de correio/_Procurar por mensagens novas"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 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:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Arquivo/_Caixa de correio/_Reconstruir árvore de pastas"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Arquivo/I_mportar arquivo mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Arquivo/_Exportar para arquivo mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Arquivo/Esvaziar _lixeira"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Arquivo/_Salvar como..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 msgid "/_File/Page set_up..."
 msgstr "/_Arquivo/Configurar _Página..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Arquivo/Im_primir"
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Arquivo/_Trabalhar desconectado"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Arquivo/Sai_r"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/_Selecionar t_hread"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editar/_Encontrar na mensagem atual..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Editar/_Procurar mensagens..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/E_xibir/_Mostrar ou esconder"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/E_xibir/_Mostrar ou esconder/_Árvore de pastas"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/E_xibir/_Mostrar ou esconder/Ver _Mensagens"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/Ícones _e texto"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/E_xibir/_Mostrar ou esconder/Texto à _direita do ícone"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/Í_cones"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/_Texto"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/E_xibir/_Mostrar ou esconder/_Barra de Ferramentas/_Nenhum"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/E_xibir/_Mostrar ou esconder/Barra de _busca"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/E_xibir/_Mostrar ou esconder/Barra de _estado"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Customize toolbar..."
 msgstr "/E_xibir/_Customizar barra de ferramentas..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/E_xibir/Á_rvore de pastas separadas"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/E_xibir/Visualização separada da _mensagem"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/E_xibir/_Ordenação"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/E_xibir/_Ordenar/por _número"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/E_xibir/_Ordenar/por _tamanho"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/E_xibir/_Ordenar/por _data"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/E_xibir/_Ordenar/por _data da discussão"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/E_xibir/_Ordenar/por _remetente"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/E_xibir/_Ordenar/por _destinatário"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/E_xibir/_Ordenar/por as_sunto"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/E_xibir/_Ordenar/por _etiqueta de cor"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/E_xibir/_Ordenar/por _marca"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/E_xibir/_Ordenar/por _não lidas"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/E_xibir/_Ordenar/por _anexos"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/E_xibir/_Ordenar/_Não ordenar"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/E_xibir/_Ordenar/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/E_xibir/_Ordenar/Crescente"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/E_xibir/_Ordenar/Decrescente"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/E_xibir/_Ordenar/Atrair _por assunto"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/E_xibir/Visão de th_read"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/E_xibir/E_xpandir todas as threads"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/E_xibir/_Fechar todas as threads"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/E_xibir/Elementos _visíveis..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/E_xibir/Ir _Para"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/E_xibir/Ir _Para/Mensagem a_nterior"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/E_xibir/Ir _Para/_Próxima mensagem"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/E_xibir/Ir _Para/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/E_xibir/Ir _Para/Anterior não _lida"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/E_xibir/Ir _Para/Próxima não l_ida"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/E_xibir/Ir _Para/Mensagem n_ova anterior"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem _nova"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/E_xibir/Ir _Para/Mensagem marcada a_nterior"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem ma_rcada"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/E_xibir/Ir _Para/Mensagem eti_quetada anterior"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/E_xibir/Ir _Para/Próxima mensagem etique_tada"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/E_xibir/Ir _Para/Outra _pasta..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/E_xibir/_Codificação de caracteres/_Detectar automaticamente"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/E_xibir/_Codificação de caracteres/Europeu Ocidental (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 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:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma n_ova janela"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Ver _fonte"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/E_xibir/_Todos os cabeçalhos"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/E_xibir/A_tualizar sumário"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Mensagem"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/_Mensagem/_Receber"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mensagem/_Receber/Receber da conta _atual"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mensagem/_Receber/Receber de _todas as contas"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Mensagem/_Receber/_Cancelar recebimento"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mensagem/_Receber/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensagem/Enviar mensagens da _fila"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensagem/Compor _nova mensagem"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/_Responder"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/_Responder para"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Mensagem/Responder para/_todos"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder para/_quem enviou"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Mensagem/Responder para/_lista"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encam_inhar"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensagem/Redire_cionar"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Mensagem/Mo_ver..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Mensagem/_Copiar..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Mensagem/_Marcar"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensagem/_Marcar/_Marcar"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensagem/_Marcar/_Desmarcar"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensagem/_Marcar/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensagem/_Marcar/Marcar como _não lida"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensagem/_Marcar/Marcar como l_ida"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Mensagem/_Marcar/Marcar _tópico como lido"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensagem/_Marcar/Marcar todas como _lidas"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Mensagem/_Apagar"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mensagem/Classificar como _spam"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensagem/Classificar como _não-spam"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensagem/Ed_itar novamente"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Ferramentas/Adicionar remetente ao catálogo de _endereços"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Ferramentas/Filtrar _todas as mensagens na pasta"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar mensagens selecionadas"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Criar regra de filtro"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Criar regra de filtro/_Automaticamente"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _remtente"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _destinatário"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo A_ssunto"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Ferramentas/Filtrar spam na _pasta"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Ferramentas/Filtrar _spam nas mensagens selecionadas"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Ferramentas/_Apagar mensagens duplicadas"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Ferramentas/_Processar mensagens marcadas"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Ferramentas/_Janela de log"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Configuração"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuração/_Preferências comuns..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configuração/Configuração de _filtros..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Configuração/_Modelo..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuração/_Ações..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Configuração/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuração/Preferências da conta _atual..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuração/Criar uma _nova conta..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuração/_Editar contas..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuração/_Mudar conta atual"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/A_juda/_Manual"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/A_juda/_Manual/_Inglês"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/A_juda/_Manual/_Japonês"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/A_juda/_FAQ"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/A_juda/_FAQ/_Inglês"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/A_juda/_FAQ/_Alemão"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/A_juda/_FAQ/_Espanhol"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/A_juda/_FAQ/_Francês"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/A_juda/_FAQ/_Italiano"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/A_juda/Opções de linha de comando"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/A_juda/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Criando janela principal...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "Pronto.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Sem título"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "nenhuma"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Mudando tipo de separação de janela de %d para %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Você está desconectado. Conectar?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Esvaziar lixeira"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Apagar todas as mensagens nas lixeiras?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3573,16 +3574,16 @@ msgstr ""
 "Se uma caixa de correio existente for especificada, ela será\n"
 "analisada automaticamente."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3592,67 +3593,67 @@ msgstr ""
 "Talvez alguns arquivos já existam, ou você não tem permissão para escrever "
 "lá."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Visão de Pastas"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Responder"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Responder para _todos"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Responder para o _remetente"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Responder para a /_lista"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/En_caminhar"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr "Você está desconectado. Clique no ícone para conectar."
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "Você está conectado. Clique no ícone para desconectar."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Sair"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Sair do programa?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Opções de linha de comando"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPÇÃO]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3680,7 +3681,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3914,7 +3915,7 @@ msgstr "Conta%d"
 msgid "Preferences for new account"
 msgstr "Preferências para a nova conta"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Preferências da Conta"
 
@@ -3927,7 +3928,7 @@ msgid "Receive"
 msgstr "Receber"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Enviar"
 
@@ -4139,7 +4140,7 @@ msgstr "Autenticar com POP3 antes de enviar"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Assinatura"
 
@@ -4599,7 +4600,7 @@ msgstr "Herdar destinatários ao responder mensagens próprias"
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Editor"
 
@@ -5697,7 +5698,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Remover [...] ou (...) do começo do assunto na resposta"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Conta"
 
@@ -5903,79 +5904,89 @@ msgstr "Imprimir"
 msgid "Print message"
 msgstr "Imprimir mensagem"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Passo"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Servidor de recepção"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Executar"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Executar os processos marcados"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Preferências"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Preferências comuns"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Enviar depois"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Pôr na 'fila de saída' e enviar depois"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Rascunho"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Inserir arquivo"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Anexar"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Apender assinatura"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Editar com um editor externo"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Quebra de linha"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas compridas"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 msgid "Customize toolbar"
 msgstr "Customizar barra de ferramentas"
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
 "the order by using the Up / Down button."
@@ -6226,7 +6237,7 @@ msgstr "Assinatura não encontrada"
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Assinatura correta"
 
@@ -6235,7 +6246,7 @@ msgstr "Assinatura correta"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Assinatura válida mas a chave para \"%s\" não é confiável"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Assinatura válida (chave desconfiável)"
 
@@ -6271,7 +6282,7 @@ msgstr "Assinatura válida mas a chave foi revogada"
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INVÁLIDA de \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "Assinatura INVÁLIDA"
 
@@ -6724,11 +6735,15 @@ msgstr "arquivo %s já existe\n"
 msgid "Creating text view...\n"
 msgstr "Criando visualização do texto...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Esta mensagem não pode ser exibida.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -6736,31 +6751,31 @@ msgstr ""
 "O corpo do texto não pode ser exibido devido a um erro ao gravar para o "
 "arquivo temporário.\n"
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "_Salvar imagem como..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Escrever _nova mensagem"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Adicionar ao _catálogo de endereços"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "Copiar este _endereço"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "A_brir com o navegador Web"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Copiar este _link"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6773,7 +6788,7 @@ msgstr ""
 "\n"
 "Abrí-la mesmo assim?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
diff --git a/po/ro.po b/po/ro.po
index 25524791..bf84fc56 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2007-02-09 09:49+0200\n"
 "Last-Translator: Cristian Secară <cristi@secarica.ro>\n"
 "Language-Team: \n"
@@ -52,168 +52,168 @@ msgstr "Adăugare mesaje la %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "Mutare mesaje %s la %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiere mesaje %s la %s ..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Ștergere mesaje %s"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nu se pot seta fanioanele de ștergere: %s\n"
 
 # hm ?
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "nu se poate elimina\n"
 
 # hm ? din sau în ?
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Ștergere mesaje din %s"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nu se pot seta fanioanele de ștergere: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "nu se poate închide folderul\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "folderul root %s nu există\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "a apărut o eroare în timpul obțineriii 'LIST'.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nu se poate crea '%s'\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nu se poate crea '%s' în INBOX\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nu se poate crea căsuța poștală: LIST a eșuat.\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "nu se poate crea căsuța poștală\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, 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:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "nu se poate șterge căsuța poștală\n"
 
 # hm ? envelope conform wikipedia
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "nu se poate obține 'envelope' (informația de routing)\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Obținere header-e mesaje (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 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:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "'envelope' (informația de routing) nu poate fi analizat: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, 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:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "nu se poate obține spațiul de nume\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nu se poate selecta folderul: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "eroare la comanda IMAP: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentificarea IMAP4 a eșuat.\n"
 
 # hm ? cu ce diferă de authentication ?
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificarea IMAP4 a eșuat.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nu se poate adăuga %s la %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(trimitere fișier...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nu se poate adăuga mesajul la %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nu se poate copia %s la %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "eroare comandă IMAP: STORE:%s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "eroare comandă IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "eroare comandă IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, 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:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nu poate efectua conversia %s la UTF-7\n"
@@ -305,20 +305,20 @@ msgstr "Exportare mesaje din %s în %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "nu se poate copia mesajului %s în %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Nu se poate deschide fișierul de marcaj.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "folderul sursă este identic cu cel destinație.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiere mesaj %s%c%d în %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -327,7 +327,7 @@ msgstr ""
 "Fișierul '%s' există deja.\n"
 "Nu se poate crea folderul."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -604,12 +604,12 @@ msgstr "  Subiect: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Emitent: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "nu se pot schimba permisiunile fișierului\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "scrierea în %s a eșuat.\n"
@@ -696,7 +696,7 @@ msgstr ""
 "pentru a activa recepționarea mesajelor la comanda 'Verifică tot'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -839,7 +839,7 @@ msgid "Add Address to Book"
 msgstr "Adăugare în agendă"
 
 # (în meniu la compunere)
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Agendă"
 
@@ -852,7 +852,7 @@ msgstr "Observații"
 msgid "Select Address Book Folder"
 msgstr "Selectați folderul pentru agendă"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fișier"
@@ -874,9 +874,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Fișier/Server _LDAP nou"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Fișier/---"
@@ -899,11 +899,11 @@ msgstr "/_Fișier/Î_nchide"
 
 # obs: comun și în main menu și în rmb agendă
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editare"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiază"
@@ -940,7 +940,7 @@ msgstr "/A_dresă/_Editează"
 msgid "/_Address/_Delete"
 msgstr "/A_dresă/Ș_terge"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Unelte"
@@ -949,12 +949,12 @@ msgstr "/_Unelte"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Unelte/Importă fișier _LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ajutor/_Despre"
@@ -1002,7 +1002,7 @@ msgstr "/_Editare/Li_pește"
 msgid "E-Mail address"
 msgstr "Adresă e-mail"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Agendă"
 
@@ -1067,7 +1067,7 @@ msgstr ""
 "Doriți să ștergeți folderul ȘI toate adresele din '%s' ?\n"
 "Dacă ștergeți doar folderul, adresele vor fi mutate în folderul părinte."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Ștergere folder"
 
@@ -1225,15 +1225,15 @@ msgstr "Adrese comune:"
 msgid "Personal address"
 msgstr "Adrese personale:"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Notificare"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Avertisment"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Eroare"
 
@@ -1335,7 +1335,7 @@ msgstr "/_Editare/An_ulează"
 msgid "/_Edit/_Redo"
 msgstr "/_Editare/_Refă"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Editare/---"
@@ -1348,7 +1348,7 @@ msgstr "/_Editare/_Taie"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editare/_Lipește ca citare"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Editare/Selecte_ază tot"
 
@@ -1364,7 +1364,7 @@ msgstr "/_Editare/Desparte _liniile lungi"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editare/Desparte liniile aut_omat"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Vizualizare"
@@ -1386,9 +1386,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Vizualizare/_Răspuns către"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Vizualizare/---"
 
@@ -1409,7 +1409,7 @@ msgstr "/_Vizualizare/_Atașament"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Vizualizare/Prsonalizează bara de _unelte..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Vizualizare/Codare caract_ere"
 
@@ -1420,112 +1420,112 @@ msgstr "/_Vizualizare/Codare caract_ere/_Automat"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Vizualizare/Codare caract_ere/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Vizualizare/Codare caract_ere/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Vizualizare/Codare caract_ere/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Vizualizare/Codare caract_ere/Western European (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Vizualizare/Codare caract_ere/Western European (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Vizualizare/Codare caract_ere/Central European (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Vizualizare/Codare caract_ere/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Vizualizare/Codare caract_ere/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Vizualizare/Codare caract_ere/Baltic (Windows-1257)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Vizualizare/Codare caract_ere/Greek (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Vizualizare/Codare caract_ere/Arabic (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Vizualizare/Codare caract_ere/Arabic (Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Vizualizare/Codare caract_ere/Hebrew (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Vizualizare/Codare caract_ere/Hebrew (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Vizualizare/Codare caract_ere/Turkish (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (KOI8-U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Vizualizare/Codare caract_ere/Cyrillic (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Vizualizare/Codare caract_ere/Japanese (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Vizualizare/Codare caract_ere/Simplified Chinese (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Vizualizare/Codare caract_ere/Simplified Chinses (GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Vizualizare/Codare caract_ere/Traditional Chinese (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Vizualizare/Codare caract_ere/Korean (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Vizualizare/Codare caract_ere/Thai (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Vizualizare/Codare caract_ere/Thai (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Unelte/_Agendă"
 
@@ -1533,13 +1533,13 @@ msgstr "/_Unelte/_Agendă"
 msgid "/_Tools/_Template"
 msgstr "/_Unelte/_Șablon"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Unelte/Acțiu_ni"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Unelte/---"
@@ -1573,71 +1573,71 @@ msgstr "%s: fișier inexistent\n"
 msgid "Can't get text part\n"
 msgstr "Nu se poate obține partea de text\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Eroare de formatare a citației."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Eroare de format mesaj de răspuns sau de trimitere mai departe."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Fișierul %s nu există\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, 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:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Fișierul %s este gol."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Nu se poate citi %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obține o parte a mesajului multiparte."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Compune%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Destinatarul nu este specificat."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Subiect gol"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Subiectul este gol. Îl trimt oricum ?"
 
 # hm ?
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "nu se poate obține lista destinatarilor."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1645,22 +1645,22 @@ msgstr ""
 "Contul pentru trimitere mail nu a fost specificat.\n"
 "Vă rugăm să selectați un cont înainte de a trimite."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "A apărut o eroare în timpul trimiterii mesajului către %s ."
 
 # !!! depinde de traducerea lui Outbox !!!
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Nu se poate salva mesajul în 'Trimise'."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nici o cheie nu a putut fi asociată cu id-ul cheii selectate '%s'."
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1672,11 +1672,11 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ca %s ?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Eroare conversie cod"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1689,15 +1689,15 @@ msgstr ""
 "\n"
 "Îl trimit oricum ?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Limită lungime linie"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr "Criptare cu Bcc"
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1711,83 +1711,83 @@ msgstr ""
 "\n"
 "Îl trimiteți oricum ?"
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "nu se poate șterge mesajul vechi\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "punere mesaj în coada de așteptare...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "nu se poate găsi folderul de coadă\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "nu se poate pune mesajului în coada de așteptare\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "Message-ID creat: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Creare fereastră de compunere...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "Semnătură PGP"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Dimensiune"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Tip MIME invalid."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Fișierul nu există sau este gol."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Nume fișier"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă este invalidă: '%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1796,48 +1796,48 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr "_Personalizează bara de unelte..."
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de așteptare."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Selectează fișiere"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Selectează fișier"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Salvează mesaj"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Acest mesaj a fost modificat. Îl salvați în folderul ciorne ?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Doriți să aplicați șablonul '%s' ?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Aplică șablon"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "Înl_ocuiește"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -1995,12 +1995,12 @@ msgstr "Editează folder"
 msgid "Input the new name of folder:"
 msgstr "Introduceți noul nume al folderului:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Folder nou"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Introduceți numele noului folder:"
 
@@ -2171,42 +2171,42 @@ msgstr "Selectează director"
 msgid "Select folder"
 msgstr "Selectează folder"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Primite (Inbox)"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Trimise"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Coadă"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Gunoi"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Ciorne"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "Folder nou"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nu poate fi inclus în numele folderului."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Folderul '%s' există deja."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Folderul '%s' nu a putut fi creat."
@@ -2293,56 +2293,56 @@ msgstr "Setare informații folder...\n"
 msgid "Setting folder info..."
 msgstr "Setare informații folder..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare folder %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare folder %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Reconstruiește arbore foldere"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Arborele de foldere va fi reconstruit. Continui ?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Reconstrucție arbore foler..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Reconstrucția arborelui de foldere a eșuat."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Verifică pentru mesaje noi în toate folderele..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Este selectat folderul %s\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descărcare mesaje în %s..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "A apărut o eroare în timpul descărcării mesajelor în '%s'."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2352,26 +2352,26 @@ msgstr ""
 "(dacă doriți să creați un folder care să conțină subfoldere,\n"
 " adăugați '/' la sfârșitul numelui)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Introduceți noul nume pentru '%s':"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Redenumește folderul"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nu se poate redenumi folderul '%s'"
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nu se poate muta folderul '%s'"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2380,11 +2380,11 @@ msgstr ""
 "Ștergeți folderul de căutare '%s' ?\n"
 "Mesajele reale NU sunt șterse de pe disc."
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Șterge folderul pentru căutare"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2397,23 +2397,23 @@ msgstr ""
 "\n"
 "Chiar doriți să ștergeți ?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nu se poate șterge folderul '%s'."
 
 # hm ? nu merge golește gunoiul cu fraza următoare, sau trebuie reformulată fraza următoare
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Golire gunoi"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Ștergeți toate mesajele din containerul de gunoi ?"
 
 # sau ștergeți ?
 # sau retrageți ?
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2422,34 +2422,34 @@ msgstr ""
 "Chiar ștergeți căsuța poștală '%s' ?\n"
 "(Mesajele NU sunt șterse de pe disc)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Șterge căsuța poștală"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sigur ștergeți contul IMAP4 '%s'?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Șterge cont IMAP4"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sigur ștergeți grupul de știri '%s' ?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Ștergere grup de știri"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sigur ștergeți contul de știri '%s' ?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Șterge contul de știri"
 
@@ -2602,142 +2602,142 @@ msgstr "Terminat"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d mesaje noi"
 
-#: src/inc.c:478
+#: src/inc.c:481
 msgid "Authenticating with POP3"
 msgstr "Autentificare cu POP3"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Recepționare mesaje noi"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Așteptare"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Anulat"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Recepționare"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gata (%d mesaj(e) (%s) primit(e))"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Gata (nu există mesaje noi)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Conexiunea a eșuat"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Autentificarea a eșuat"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Blocat"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Timp expirat"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminat (%d noi mesaj(e))"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Terminat (nu există mesaje noi)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Au avut loc unele erori în timpul obținerii mail-ului."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "obținere mesaje noi pentru contul %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Autentificare cu POP3"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: recepționare mesaje noi"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectare la serverul POP3: %s ..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nu se poate efectua conexiunea la serverul POP3: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Recepționare mesaje de la %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obținerea numărului de mesaje noi (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obținerea numărului de mesaje noi (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obținerea numărului de mesaje noi (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obținerea dimensiunii mesajelor (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Ștergere mesaje %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Părăsire"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recepționare mesaj (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Recepționare (%d mesaj(e) (%s) primit(e))"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Conexiunea a eșuat"
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "A apărut o eroare în timpul procesării mail-ului."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2746,28 +2746,28 @@ msgstr ""
 "A apărut o eroare în timpul procesării mail-ului.\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Nu mai este spațiu pe disc."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Nu se poate scrie fișierul."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Eroare socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Conexiune închisă de serverul de la distanță."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Căsuța poștală este blocată"
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2776,11 +2776,11 @@ msgstr ""
 "Căsuța poștală este blocată:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Autentificarea a eșuat."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2789,15 +2789,15 @@ msgstr ""
 "Autentificarea a eșuat:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Timpul sesiunii a expirat."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Încorporarea a fost anulată\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Obținere mesaje noi de la %s în %s...\n"
@@ -2932,7 +2932,7 @@ msgstr "Mesaje în coada de așteptare"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Există mesaje netrimise în coada de așteptare. Ieșiți acum ?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2941,15 +2941,15 @@ msgstr ""
 "Suportul pentru OpenPGP a fost dezactivat."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "rulează deja o altă sesiune Sylpheed.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Migrarea configurației"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2957,662 +2957,663 @@ msgstr ""
 "S-a găsit versiunea anterioară de configurare.\n"
 "Doriți să o migrați ?"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Fișier/_Folder"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fișier/_Folder/Crează folder _nou..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fișier/_Folder/_Redenumește folderul..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Fișier/_Folder/_Mută folderul..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fișier/_Folder/Șter_ge folderul"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Fișier/_Căsuță poștală"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Fișier/_Căsuță poștală/_Adaugă căsuță poștală..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Fișier/_Căsuță poștală/Ște_rge căsuță poștală"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_Fișier/_Căsuță poștală/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Fișier/_Căsuță poștală/Verifi_că pentru mesaje noi"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 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 ?
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Fișier/_Căsuță poștală/R_econstruiește arbore folder"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fișier/_Importă fișier mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fișier/_Exportă fișier mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Fișier/_Golește gunoiul"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Fișier/_Salvează ca..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 msgid "/_File/Page set_up..."
 msgstr "/_Fișier/_Aranjare în pagină..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Fișier/Ti_părește..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Fișier/_Lucrează deconectat"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Fișier/Ieși_re"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Editare/Selectează firul de _discuție"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editare/_Caută în mesajul curent..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Editare/Caută în me_saje..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Vizualizare/Arată sau ascun_de"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Vizualizare/Arată sau ascun_de/Arbore _folder"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Vizualizare/Arată sau ascun_de/Vizualizare _mesaje"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/Iconuri și te_xt"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 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 _dreapta iconurilor"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/_Iconuri"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/_Text"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de unel_te/_Nimic"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de _căutare"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Vizualizare/Arată sau ascun_de/Bară de _stare"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Vizualizare/_Personalizează bara de unelte..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Vizualizare/Separă fereastra arb_orelui folderelor"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/_Vizualizare/Separă fereastra de previzualizare a _mesajelor"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Vizualizare/_Sortează"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Vizualizare/_Sortează/după _număr"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Vizualizare/_Sortează/după d_imensiune"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Vizualizare/_Sortează/după _dată"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Vizualizare/_Sortează/după dată _fir de discuție"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Vizualizare/_Sortează/după e_xpeditor"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Vizualizare/_Sortează/după destinata_r"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Vizualizare/_Sortează/după _subiect"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Vizualizare/_Sortează/după etichetă _culoare"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Vizualizare/_Sortează/după _marcaj"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Vizualizare/_Sortează/d_upă necitit"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Vizualizare/_Sortează/după a_tașament"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Vizualizare/_Sortează/Nes_ortat"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Vizualizare/_Sortează/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Vizualizare/_Sortează/Ascendent"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Vizualizare/_Sortează/Descendent"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Vizualizare/_Sortează/_Atrage după subiect"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Vizualizare/Vizualizează ca fi_r de discuții"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Vizualizare/Des_fășoară firul discuțiilor"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Vizualizare/P_liază firul discuțiilor"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Vizualizare/Stab_ilește elementele afișate ale sumarului..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Vizualizare/Du-_te la"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Vizualizare/Du-_te la/mesajul _precedent"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Vizualizare/Du-_te la/mesajul _următor"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Vizualizare/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Vizualizare/Du-_te la/mesajul necitit p_recedent"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Vizualizare/Du-_te la/mesajul necitit urmă_tor"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Vizualizare/Du-_te la/mesajul nou pre_cedent"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Vizualizare/Du-_te la/mesajul nou următ_or"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Vizualizare/Du-_te la/mesajul _marcat precedent"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Vizualizare/Du-_te la/mesajul m_arcat următor"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Vizualizare/Du-_te la/mesajul _etichetat precedent"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Vizualizare/Du-_te la/mesajul et_ichetat următor"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Vizualizare/Du-_te la/alt _director..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Vizualizare/Codare caract_ere/Detectare _automată"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Vizualizare/Codare caract_ere/Western European (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Vizualizare/Codare caract_ere/Japanese (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Vizualizare/Codare caract_ere/Japanese (EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Vizualizare/Codare caract_ere/Japanese (Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Vizualizare/Codare caract_ere/Traditional Chinese (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Vizualizare/Codare caract_ere/Chinese (ISO-2022-CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vizualizare/Codare caract_ere/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Vizualizare/Des_chide în fereastră nouă"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Vizualizare/Sursă mes_aj"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/_Vizualizare/Toate _header-ele"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Vizualizare/Act_ualizează sumarul mesajelor"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Mesaj"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/_Mesaj/_Primire"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Mesaj/_Primire/Verifică pentru contul _curent"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Mesaj/_Primire/Verifică pentru _toate conturile"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Mesaj/_Primire/A_nulează primirea"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Mesaj/_Primire/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mesaj/Trimite mesajele de la coa_dă"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Mesaj/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Mesaj/Compune un mesaj _nou"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Mesaj/_Răspunde"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Mesaj/Răspunde _la"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mesaj/Răspunde _la/_toți"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mesaj/Răspunde _la/_expeditor"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mesaj/Răspunde _la/_lista de discuții"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Mesaj/Trimite mai _departe"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mesaj/Trimite mai departe ca _atașament"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Mesaj/Redirecționea_ză"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Mesaj/Mu_tă..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Mesaj/_Copiază..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Mesaj/_Marchează"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mesaj/_Marchează/_Marchează"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mesaj/_Marchează/_Demarchează"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Mesaj/_Marchează/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mesaj/_Marchează/Marchează ca _necitit"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mesaj/_Marchează/Marchează ca _citit"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Mesaj/_Marchează/Marchează _firul de discuție ca citit"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mesaj/_Marchează/Marchează _totul ca citit"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Mesaj/Șter_ge"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Mesaj/Marchează ca _spam"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mesaj/Marchează ca _util"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Mesaj/Re_editează"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Unelte/A_daugă expeditorul în agendă..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Unelte/_Filtrează toate mesajele în folder"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Unelte/Filtrează mesajele _selectate"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Unelte/_Crează regulă de filtrare"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Unelte/_Crează regulă de filtrare/_Automat"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Unelte/_Crează regulă de filtrare/pe baza câmpului _De la"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Unelte/_Crează regulă de filtrare/pe baza câmpului _Către"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Unelte/_Crează regulă de filtrare/pe baza câmpului _Subiect"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Unelte/Filtrează mesa_jele spam în folder"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Unelte/Filtrează _mesajele spam în mesajele selectate"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Unelte/Șterge mesajele du_plicate"
 
 # !!! n-am pus _
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 msgid "/_Tools/E_xecute marked process"
 msgstr "/_Unelte/E_xecută procesele marcate"
 
 # temporar (log)
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Unelte/Fereastră _log"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Configurație"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 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:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Configurație/_Filtre..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Configurație/Șa_blon..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configurație/_Acțiuni..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Configurație/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configurație/_Preferințe pentru contul curent..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configurație/Crează cont _nou..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configurație/_Editează conturile..."
 
 # hm ? eu zic că e mai bine decît schimbă contul curent
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configurație/_Selectează contul curent"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Ajutor/_Manual"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Ajutor/_Manual/_Engleză"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Ajutor/_Manual/_Japoneză"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/_Ajutor/_FAQ"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Ajutor/_FAQ/_Engleză"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Ajutor/_FAQ/_Germană"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Ajutor/_FAQ/_Spaniolă"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Ajutor/_FAQ/_Franceză"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Ajutor/_FAQ/_Italiană"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/_Ajutor/Opțiuni linie de _comandă"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Ajutor/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Creare fereastră principală...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eșuat\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "gata.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Neintitulat"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "nimic"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Schimbare tip separator fereastră din %d în %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Deconectat"
 
 # hm ?
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Sunteți în modul deconectat. Treceți în modul conectat ?"
 
 # hm ? nu merge golește gunoiul cu fraza următoare, sau trebuie reformulată fraza următoare
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Golire gunoi"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Ștergeți toate mesajele din containerele de gunoi ?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Adaugă căsuță poștală"
 
 # hm ? sau specificați ? este o explicație sau o comandă ?
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3622,16 +3623,16 @@ msgstr ""
 "Dacă este specificată căsuța poștală existentă,\n"
 "aceasta va fi scanată automat."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Cutia poștală '%s' există deja."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Căsuță poștală"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3641,69 +3642,69 @@ msgstr ""
 "Poate că anumite fișiere există deja, sau acolo nu aveți permisiuni de "
 "scriere."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Vizualizare folder"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vizualizare mesaj"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Răspunde _tuturor"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Răspunde _expeditorului"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _listei de discuții"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Trimite mai _departe"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Trimite mai departe ca _atașament"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Redirecționea_ză"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Sunteți în modul deconectat. Clic pe icon pentru a trece în modul conectat."
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 "Sunteți în modul conectat. Clic pe icon pentru a trece în modul deconectat."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Ieșire"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Ieșiți din acest program ?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Opțiuni line de comandă"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilizare: sylpheed [OPȚIUNE]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3731,7 +3732,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3969,7 +3970,7 @@ msgstr "Cont%d"
 msgid "Preferences for new account"
 msgstr "Preferințe pentru contul nou"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Preferințe cont"
 
@@ -3984,7 +3985,7 @@ msgstr "Primire"
 
 # obs: comun și pentru butonul din toolbar și pentru tab-ul din common preferences și edit accounts
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Trimite"
 
@@ -4200,7 +4201,7 @@ msgstr "Autentifică cu POP3 înainte de a trimite"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Semnătură"
 
@@ -4668,7 +4669,7 @@ msgstr "Păstrează destinatarii inițiali când se răspunde la mesaje proprii"
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Editor"
 
@@ -5777,7 +5778,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Șterge [...] sau (...) la începutul subiectului când se răspunde"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cont"
 
@@ -5984,80 +5985,90 @@ msgstr "Tipărește"
 msgid "Print message"
 msgstr "Tipărește mesajul"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Pas"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Server pentru primire"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Execută"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Execută procesele marcate"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Preferințe"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Preferințe comune"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Trimite acum"
 
 # hm ? sau trimite mai târziu ?
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Mai târziu"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Pune în coada de așteptare și trimite mai târziu"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Ciornă"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Salvează în folderul de ciorne"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Inserează"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Iserează fișier"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Atașează"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Atașează fișier"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Adaugă semnătură"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Editare cu editor extern"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Desparte liniile"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Desparte toate liniile lungi"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 msgid "Customize toolbar"
 msgstr "Personalizează bara de unelte"
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
 "the order by using the Up / Down button."
@@ -6312,7 +6323,7 @@ msgstr "Nu s-a găsit semnătura"
 msgid "Good signature from \"%s\""
 msgstr "Semnătură bună de la \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Semnătură bună"
 
@@ -6321,7 +6332,7 @@ msgstr "Semnătură bună"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Semnătură validă, dar cheia pentru \"%s\" nu este de încredere"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Semnătură validă (cheia nu este de încredere)"
 
@@ -6357,7 +6368,7 @@ msgstr "Semnătură validă, dar cheia de semnătură a fost revocată"
 msgid "BAD signature from \"%s\""
 msgstr "Semnătură BAD de la \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "Semnătură BAD"
 
@@ -6812,11 +6823,15 @@ msgstr "fișierul %s există deja\n"
 msgid "Creating text view...\n"
 msgstr "Creare vizualizare text...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Acest mesaj nu poate fi afișat.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
@@ -6824,32 +6839,32 @@ msgstr ""
 "Corpul mesajului nu a putut fi afișat, deoarece scrierea în fișierul "
 "temporar a eșuat.\n"
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "Sal_vează acestă imagine ca..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Compune un mesaj _nou"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Adăugă în a_gendă..."
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "Copiază această ad_resă"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "_Deschide cu browser Web"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Copiază acest _link"
 
 # !!! de verificat cum arată practic !!!
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6862,7 +6877,7 @@ msgstr ""
 "\n"
 "Îl deschid oricum ?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Avertizare de URL fals"
 
diff --git a/po/ru.po b/po/ru.po
index 8513cf1d..93413d3d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2006-06-09 14:30+0400\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -53,161 +53,161 @@ msgstr "Добавление сообщений в %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "Перемещение сообщений %s в %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копирование сообщений %s в %s ..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Удаление сообщений %s"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не удалось установить флаг удаления: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "не удалось очистить папку от удалённых сообщений\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Удаление всех сообщений из %s"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не удалось установить флаг удаления: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "невозможно закрыть папку\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "корневая папка %s не существует\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "произошла ошибка при получении LIST.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ошибка при создании \"%s\"\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ошибка при создании \"%s\" внутри INBOX\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не удалось создать почтовый ящик: ошибка LIST\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "не удалось создать почтовый ящик\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не удалось переименовать почтовый ящик %s в %s\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "не удалось удалить почтовый ящик\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "не удалось получить данные конверта\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Получение заголовков сообщений (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "ошибка при получении данных конверта.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ошибка при разборе данных конверта: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не удалось открыть сеанс связи IMAP4 c %s:%d\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "не удалось получить пространство имён\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "невозможно выбрать папку: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "ошибка при выполнении команды IMAP: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "Ошибка аутентификации IMAP4.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "Ошибка авторизации IMAP4.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не удалось добавить %s к %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(передача файла...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не удалось добавить сообщение к %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не удалось скопировать %s в %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "ошибка при выполнении команды IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "ошибка при выполнении команды IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "ошибка при выполнении команды IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "ошибка преобразования iconv из UTF-7 в %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "ошибка преобразования iconv из %s в UTF-7\n"
@@ -300,20 +300,20 @@ msgstr "Экспорт сообщений из %s в %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "не удалось скопировать сообщение %s в %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Не удалось открыть файл пометок.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "исходная папка совпадает с папкой назначения.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Копирование сообщения %s%c%d в %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -322,7 +322,7 @@ msgstr ""
 "Файл \"%s\" уже существует.\n"
 "Нельзя создать папку с таким же именем."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -598,12 +598,12 @@ msgstr "  Субъект: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Сертификат выдал: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "не удалось изменить свойства файла\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "запись в %s не удалась.\n"
@@ -688,7 +688,7 @@ msgstr ""
 "по команде \"Получить все\"."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -823,7 +823,7 @@ msgstr "Пользовательский параметр действия"
 msgid "Add Address to Book"
 msgstr "Добавление адреса в книгу"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Адрес"
 
@@ -836,7 +836,7 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
@@ -858,9 +858,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новый сервер LDAP"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/Файл/---"
@@ -882,11 +882,11 @@ msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Правка"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
@@ -923,7 +923,7 @@ msgstr "/Адрес/Правка"
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Инструменты"
@@ -932,12 +932,12 @@ msgstr "/Инструменты"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
@@ -984,7 +984,7 @@ msgstr "/Правка/Вставить"
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Адресная книга"
 
@@ -1049,7 +1049,7 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Удалить папку"
 
@@ -1206,15 +1206,15 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Уведомление"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Ошибка"
 
@@ -1314,7 +1314,7 @@ msgstr "/Правка/Отменить"
 msgid "/_Edit/_Redo"
 msgstr "/Правка/Повторить"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Правка/---"
@@ -1327,7 +1327,7 @@ msgstr "/Правка/Вырезать"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Правка/Вставить как цитату"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Правка/Выделить всё"
 
@@ -1343,7 +1343,7 @@ msgstr "/Правка/Отформатировать всё сообщение"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Правка/Перенос по словам при вводе"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/Вид"
@@ -1365,9 +1365,9 @@ msgid "/_View/_Reply to"
 msgstr "/Вид/Адрес для ответа"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Вид/---"
 
@@ -1388,7 +1388,7 @@ msgstr "/Вид/Вложения"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Вид/Перейти/К другой папке..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Вид/Кодировка"
 
@@ -1399,113 +1399,113 @@ msgstr "/Вид/Кодировка/Автоопределение"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Вид/Кодировка/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вид/Кодировка/7-битный ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вид/Кодировка/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вид/Кодировка/Западноевропейская (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вид/Кодировка/Центральноевропейская (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вид/Кодировка/Прибалтийская (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вид/Кодировка/Прибалтийская (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Вид/Кодировка/Арабская (Windows-1256)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вид/Кодировка/Греческая (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Вид/Кодировка/Арабская (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Вид/Кодировка/Арабская (Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вид/Кодировка/Иврит (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вид/Кодировка/Иврит (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вид/Кодировка/Турецкая (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вид/Кодировка/Кириллица (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вид/Кодировка/Кириллица (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вид/Кодировка/Кириллица\\/Украина (KOI8-_U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вид/Кодировка/Кириллица (_Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вид/Кодировка/Китайская упрощённая (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вид/Кодировка/Китайская упрощённая (GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вид/Кодировка/Китайская традиционная (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вид/Кодировка/Корейская (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вид/Кодировка/Тайская (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вид/Кодировка/Тайская (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/Инструменты/Адресная книга"
 
@@ -1513,13 +1513,13 @@ msgstr "/Инструменты/Адресная книга"
 msgid "/_Tools/_Template"
 msgstr "/Инструменты/Шаблон"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/Инструменты/Действия"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/Инструменты/---"
@@ -1553,70 +1553,70 @@ msgstr "%s: файл не существует\n"
 msgid "Can't get text part\n"
 msgstr "Ошибка получения части текста\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Неверный формат метки цитирования."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Неверный формат шаблона ответа или пересылки."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не найден\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ошибка определения размера файла %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s пустой."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Невозможно прочитать %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Подготовка сообщения%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Получатель сообщения не указан."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Тема не указана"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема сообщения не указана. Отправить без темы?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "ошибка определения списка получателей."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1624,21 +1624,21 @@ msgstr ""
 "Учётная запись для отправки почты не определена.\n"
 "Пожалуйста, выберите её перед отправкой."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Произошла ошибка при отправке сообщения на %s ."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Ошибка сохранения сообщения в папке отправленных."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не найден ключ, соответствующий выбранному идентификатору \"%s\"."
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1649,11 +1649,11 @@ msgstr ""
 "\n"
 "Отправить его в кодировке %s?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Ошибка преобразования кодировки"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1666,15 +1666,15 @@ msgstr ""
 "\n"
 "Отправить сообщение?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Слишком длинная строка"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1683,83 +1683,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "ошибка удаления старого сообщения\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "постановка сообщения в очередь...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "невозможно найти папку очереди\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "ошибка размещения в очереди\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "создан Message-ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Создание окна подготовки сообщения...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "Подписать PGP"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "Шифровать PGP"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "Тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Размер"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1769,48 +1769,48 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Сохранить его в папке черновиков?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "Закрыть без сохранения"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "Вставить"
 
@@ -1967,12 +1967,12 @@ msgstr "Изменить имя папки"
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -2140,42 +2140,42 @@ msgstr "Выбор каталога"
 msgid "Select folder"
 msgstr "Выбор папки"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Входящие"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Отправленные"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Очередь"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Корзина"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Черновики"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "НоваяПапка"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Символ \"%c\" не может входить в имя папки."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка \"%s\" уже существует."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не удалось создать папку \"%s\"."
@@ -2263,56 +2263,56 @@ msgstr "Установка информации о папке...\n"
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Перестроить дерево папок"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок будет перестроено. Продолжить?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Перестройка дерева папок..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ошибка при перестройке дерева папок."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Проверка новых сообщений во всех папках..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Спам"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s выбрана\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Загружаются сообщения из %s ..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Произошла ошибка при загрузке сообщений из \"%s\"."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2322,26 +2322,26 @@ msgstr ""
 "(если вы хотите создать папку для вложенных папок,\n"
 " добавьте \"/\" в конец имени)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введите новое имя для \"%s\":"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Переименовать папку"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Не удалось переименовать папку \"%s\"."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не удалось переместить папку \"%s\"."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2350,11 +2350,11 @@ msgstr ""
 "Удалить папку поиска \"%s\"?\n"
 "Это не приведёт к удалению сообщений."
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Удалить папку поиска"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2367,20 +2367,20 @@ msgstr ""
 "\n"
 "Вы действительно хотите удалить папку?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ошибка при удалении папки \"%s\"."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Очистка корзины"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2389,34 +2389,34 @@ msgstr ""
 "Удалить почтовый ящик \"%s\"?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Удалить учётную запись IMAP4 \"%s\"?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Удалить учётную запись IMAP4"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Удалить группу новостей \"%s\"?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Удаление группы новостей"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Удалить учётную запись новостей \"%s\"?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Удалить учётную запись новостей"
 
@@ -2562,143 +2562,143 @@ msgstr "Завершение"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed (новых сообщений: %d)"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Аутентификация"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Получение новых сообщений"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Ожидание"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Отменена"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Получение"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Выполнено (принято сообщений: %d (%s))"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Выполнено (нет новых сообщений)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Ошибка соединения"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Неверный пароль"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Занято"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Нет ответа"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завершено (новых сообщений: %d)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Завершено (нет новых сообщений)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "При получении сообщений возникли ошибки."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "получение новых сообщений для учётной записи %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Аутентификация"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Получение новых сообщений"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Соединение с сервером POP3: %s..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером POP3: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Получение сообщений с %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Получение количества новых сообщений (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Получение количества новых сообщений (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Получение количества новых сообщений (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Получение размера сообщений (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Удаление сообщения %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Выход"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получение сообщения (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Приём (принято сообщений: %d (%s))"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Ошибка соединения"
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2707,28 +2707,28 @@ msgstr ""
 "Произошла ошибка при обработке сообщений:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Нет места на диске."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Ошибка записи в файл."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Ошибка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Сервер закрыл соединение."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Почтовый ящик занят."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2737,11 +2737,11 @@ msgstr ""
 "Почтовый ящик занят:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2750,15 +2750,15 @@ msgstr ""
 "Ошибка аутентификации:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Время сеанса истекло."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Приём сообщений прерван\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Получение новых сообщений из %s в %s...\n"
@@ -2889,7 +2889,7 @@ msgstr "Сообщения в очереди"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "В очереди есть неотправленные сообщения. Выходить?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2898,15 +2898,15 @@ msgstr ""
 "Поддержка OpenPGP отключена."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "другая копия Sylpheed уже запущена.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Импорт предыдущей конфигурации"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2914,656 +2914,657 @@ msgstr ""
 "Обнаружены настройки, сделанные в предыдущей версии.\n"
 "Использовать их?"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/Файл/Папка"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Файл/Папка/Создать новую папку..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Файл/Папка/Переименовать папку..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/Файл/Папка/Переместить папку..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Файл/Папка/Удалить папку"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/Файл/Почтовый ящик"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Файл/Почтовый ящик/Добавить почтовый ящик..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Файл/Почтовый ящик/Удалить почтовый ящик"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/Файл/Почтовый ящик/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Файл/Почтовый ящик/Проверить новые сообщения"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Файл/Почтовый ящик/Проверить новые сообщения во всех папках"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Файл/Почтовый ящик/Перестроить дерево папок"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/Файл/Импорт mbox-файла..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/Файл/Экспорт в mbox-файл..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/Файл/Очистить все корзины"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/Файл/Сохранить как..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/Файл/Сохранить как..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/Файл/Печать..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/Файл/Работать автономно"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/Файл/Выход"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/Правка/Выделить обсуждение"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/Правка/Поиск в текущем сообщении..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/Правка/Поиск сообщений..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/Вид/Показать или скрыть"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Вид/Показать или скрыть/Дерево папок"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Вид/Показать или скрыть/Область просмотра"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Вид/Показать или скрыть/Панель инструментов"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Значки и текст"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Значки"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Значки"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Текст"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Вид/Показать или скрыть/Панель инструментов/Не показывать"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Вид/Показать или скрыть/Строка поиска"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Вид/Показать или скрыть/Строка состояния"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/Вид/Перейти/К другой папке..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/Вид/Отдельное дерево папок"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/Вид/Отдельное окно сообщения"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/Вид/Сортировка"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/Вид/Сортировка/По номеру"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Вид/Сортировка/По размеру"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/Вид/Сортировка/По дате"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Вид/Сортировка/По дате обсуждения"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/Вид/Сортировка/По отправителю"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Вид/Сортировка/По получателю"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/Вид/Сортировка/По теме"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/Вид/Сортировка/По выделению цветом"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/Вид/Сортировка/По отметке"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/Вид/Сортировка/По непрочитанным"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Вид/Сортировка/По вложениям"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Вид/Сортировка/Без сортировки"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/Вид/Сортировка/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/Вид/Сортировка/По возрастанию"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/Вид/Сортировка/По убыванию"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Вид/Сортировка/Группировка по теме"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/Вид/Группировка по дискуссиям"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/Вид/Развернуть все обсуждения"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/Вид/Свернуть все обсуждения"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/Вид/Установить видимые поля..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/Вид/Перейти"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Вид/Перейти/Предыдущее сообщение"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/Вид/Перейти/Следующее сообщение"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/Вид/Перейти/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Вид/Перейти/Предыдущее непрочитанное сообщение"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Вид/Перейти/Следующее непрочитанное сообщение"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Вид/Перейти/Предыдущее новое сообщение"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Вид/Перейти/Следующее новое сообщение"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Вид/Перейти/Предыдущее отмеченное сообщение"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Вид/Перейти/Следующее отмеченное сообщение"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Вид/Перейти/Предыдущее выделенное цветом сообщение"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Вид/Перейти/Следующее выделенное цветом сообщение"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вид/Перейти/К другой папке..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вид/Кодировка/Автоопределение"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Вид/Кодировка/Западноевропейская (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вид/Кодировка/Японская (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вид/Кодировка/Японская (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вид/Кодировка/Японская (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вид/Кодировка/Китайская традиционная (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вид/Кодировка/Китайская (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вид/Кодировка/Корейская (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/Вид/Открыть в новом окне"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/Вид/Показать исходный текст"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Вид/Все заголовки"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/Вид/Обновить список сообщений"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/Сообщение"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/Сообщение/Получить"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Сообщение/Получить/Получить с текущей учётной записи"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Сообщение/Получить/Получить со всех учётных записей"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/Сообщение/Получить/Прервать получение сообщений"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/Сообщение/Получить/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/Сообщение/Отправить сообщения из очереди"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/Сообщение/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/Сообщение/Написать новое сообщение"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/Сообщение/Ответить"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/Сообщение/Ответить..."
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Сообщение/Ответить.../Всем"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Сообщение/Ответить.../Отправителю"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Сообщение/Ответить.../В список рассылки"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/Сообщение/Переслать"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/Сообщение/Переслать как вложение"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/Сообщение/Перенаправить без изменений"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/Сообщение/Переместить..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/Сообщение/Копировать..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/Сообщение/Отметить"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Сообщение/Отметить/Отметить"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Сообщение/Отметить/Снять отметку"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/Сообщение/Отметить/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Сообщение/Отметить/Пометить как непрочитанное"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Сообщение/Отметить/Пометить как прочитанное"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Сообщение/Отметить/Пометить обсуждение как прочитанное"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Сообщение/Отметить/Пометить все сообщения как прочитанные"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/Сообщение/Удалить"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/Сообщение/Пометить как спам"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Сообщение/Пометить как не спам"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/Сообщение/Изменить"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Инструменты/Добавить отправителя в адресную книгу"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Инструменты/Отфильтровать все сообщения в папке"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Инструменты/Отфильтровать выбранные сообщения"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/Инструменты/Создать правило фильтрации"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Инструменты/Создать правило фильтрации/Автоматически"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Инструменты/Создать правило фильтрации/По отправителю"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Инструменты/Создать правило фильтрации/По получателю"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Инструменты/Создать правило фильтрации/По теме"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Инструменты/Отфильтровать спам в папке"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Инструменты/Отфильтровать спам в выбранных сообщениях"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Инструменты/Удалить повторяющиеся сообщения"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Выполнить отмеченный процесс"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/Инструменты/Окно журнала"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/Настройка"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Настройка/Общие настройки..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Настройка/Настройка фильтров..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/Настройка/Шаблоны..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/Настройка/Действия..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/Настройка/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Настройка/Настройка текущей учётной записи... "
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/Настройка/Создать новую учётную запись..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Настройка/Редактирование учётных записей..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/Настройка/Переключить текущую учётную запись"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/Справка/Руководство"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/Справка/Руководство/Английское"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Справка/Руководство/Японское"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/Справка/FAQ"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/Справка/FAQ/Английский"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/Справка/FAQ/Немецкий"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Справка/FAQ/Испанский"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/Справка/FAQ/Французский"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Справка/FAQ/Итальянский"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/Справка/Параметры командной строки"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/Справка/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Создание главного окна...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "выполнено.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Без названия"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "нет"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Изменение типа разделения окна с %d на %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Автономная работа"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Вы работаете в автономном режиме. Подключиться к сети?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Очистить все корзины"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Добавить почтовый ящик"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3573,16 +3574,16 @@ msgstr ""
 "Если будет указан существующий ящик, то он\n"
 "будет автоматически прочитан."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Почтовый ящик \"%s\" уже существует."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3592,68 +3593,68 @@ msgstr ""
 "Возможно, некоторые файлы уже существуют, или вы не имеете прав на запись в "
 "каталог."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Ответить"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Ответить всем"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Ответить отправителю"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Ответить в список рассылки"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Переслать"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Переслать как вложение"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Перенаправить без изменений"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 "Вы работаете в автономном режиме. Щёлкните по значку, чтобы подключиться."
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "Вы подключены. Щёлкните по значку, чтобы работать автономно."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Выход"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Выйти из программы?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Параметры командной строки"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Использование: sylpheed [ПАРАМЕТР]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3681,7 +3682,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3915,7 +3916,7 @@ msgstr "Учётная запись %d"
 msgid "Preferences for new account"
 msgstr "Настройки новой учётной записи"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Настройки учётной записи"
 
@@ -3928,7 +3929,7 @@ msgid "Receive"
 msgstr "Приём"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Отправить"
 
@@ -4142,7 +4143,7 @@ msgstr "Проверка пароля через POP3 перед отправк�
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Подпись"
 
@@ -4603,7 +4604,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Редактор"
 
@@ -5710,7 +5711,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Удалять [...] или (...) в начале темы сообщения при ответе"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Учётная запись"
 
@@ -5924,80 +5925,90 @@ msgstr "Печать"
 msgid "Print message"
 msgstr "Отправить сообщение"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Шаг"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Сервер для приёма"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Выполнить"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Выполнить отмеченный процесс"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Свойства"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Общие настройки"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Отправить позже"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Поместить в очередь и отправить позже"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Черновики"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Сохранить в папке черновиков"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Вставить"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Вставить файл"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Вложение"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Вложить файл"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Добавить подпись"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Править внешним редактором"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Перенос строк"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Отформатировать всё сообщение"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/Вид/Перейти/К другой папке..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6250,7 +6261,7 @@ msgstr "Подпись не найдена"
 msgid "Good signature from \"%s\""
 msgstr "Хорошая подпись от \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Хорошая подпись"
 
@@ -6259,7 +6270,7 @@ msgstr "Хорошая подпись"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Подпись от \"%s\" правильная, но нет доверия ключу"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Подпись правильная, но нет доверия ключу"
 
@@ -6295,7 +6306,7 @@ msgstr "Подпись правильная, но ключ был отозван
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись  от \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "ПЛОХАЯ подпись"
 
@@ -6742,41 +6753,45 @@ msgstr "файл %s уже существует\n"
 msgid "Creating text view...\n"
 msgstr "Создание области просмотра текста...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Невозможно отобразить сообщение.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "Сохранить изображение как..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Написать новое сообщение"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Добавить в адресную книгу"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "Копировать адрес"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "Открыть в браузере"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Копировать ссылку"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6789,7 +6804,7 @@ msgstr ""
 "\n"
 "Всё равно открыть?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Внимание - подмена URL"
 
diff --git a/po/sk.po b/po/sk.po
index c066111b..3864dd93 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+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"
@@ -54,162 +54,162 @@ msgstr "Odosielam správu (%d / %d bajtov)"
 msgid "Moving messages %s to %s ..."
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Prijímam správy z %s..."
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nedá sa nastaviť príznak zmazania: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "nedá sa odstrániť\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Prijímam správy z %s..."
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nedá sa nastaviť príznak zmazania: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "priečinok sa nedá zatvoriť\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "koreňový priečinok %s neexistuje\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "pri príkaze LIST sa vyskytla chyba.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nedá sa vytvoriť '%s'\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nedá sa vytvoriť '%s' v INBOXe\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nedá sa vytvoriť schránka: príkaz LIST zlyhal\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "nedá sa vytvoriť schránka\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nedá sa premenovať schránka: %s na %s\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "schránka sa nedá odstrániť \n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "obálka sa nedá načítať\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "pri získavaní obálky sa vyskytla chyba.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "obálka sa nedá prečítať: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, 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:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "nedá sa nájsť obálka\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "priečinok sa nedá vytvoriť: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentizácia bola neúspešná.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "neúspešné prihlásenie k IMAP4.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nedá sa napojiť %s k %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(posielam súbor...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nedá sa napojiť správa k %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nedá sa kopírovať %s do %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba pri IMAP príkaze: STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba pri IMAP príkaze: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
@@ -301,20 +301,20 @@ msgstr "Exportujem správy z %s do %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "nemôžem kopírovať správu %s do %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Nemôžem označiť súbor so značkami.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "zdrojový priečinok je ten istý ako cieľový.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -323,7 +323,7 @@ msgstr ""
 "Súbor '%s' už existuje.\n"
 "Priečinok sa nedá vytvoriť."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -594,12 +594,12 @@ msgstr "  Predmet: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Vydavateľ: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "nedá sa zmeniť mód súboru\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "nepodaril sa zápis do %s.\n"
@@ -681,7 +681,7 @@ msgstr ""
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -818,7 +818,7 @@ msgstr "Používateľský parameter pre akciu"
 msgid "Add Address to Book"
 msgstr "Pridať adresu do adresára"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresár"
 
@@ -831,7 +831,7 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Súbor"
@@ -854,9 +854,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Súbor/Nový _Server"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Súbor/---"
@@ -878,11 +878,11 @@ msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
@@ -919,7 +919,7 @@ msgstr "/_Adresa/_Upraviť"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
@@ -928,12 +928,12 @@ msgstr "/_Nástroje"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
@@ -980,7 +980,7 @@ msgstr "/Úp_ravy/_Prilepiť"
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
@@ -1045,7 +1045,7 @@ msgstr ""
 "Naozaj chcete zmazať priečinok A SÚČASNE všetky adresy v %s ?\n"
 "Ak zmažete len priečinok, adresy z neho sa presunú do nadradeného priečinku."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
@@ -1205,15 +1205,15 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Varovanie"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Chyba"
 
@@ -1318,7 +1318,7 @@ msgstr "/Úp_ravy"
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu urobiť"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
@@ -1331,7 +1331,7 @@ msgstr "/Úp_ravy/_Vystrihnúť"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Prilepiť ako _citáciu"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vy_brať všetko"
 
@@ -1348,7 +1348,7 @@ msgstr "/Úp_ravy/Zalomiť všetky _dlhé riadky"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Zobraziť"
@@ -1370,9 +1370,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Zobraziť/_Odpoveď komu"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Zobraziť/---"
 
@@ -1393,7 +1393,7 @@ msgstr "/_Zobraziť/Prí_lohy"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
@@ -1405,138 +1405,138 @@ msgstr ""
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Zobraziť/_Kódovanie/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Zobraziť/_Kódovanie/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Zobraziť/_Kódovanie/Stredná Európa (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Zobraziť/_Kódovanie/_Pobaltie (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Zobraziť/_Kódovanie/Turecko (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
@@ -1544,13 +1544,13 @@ msgstr "/_Nástroje/_Adresár"
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
@@ -1589,71 +1589,71 @@ msgstr "%s: súbor neexistuje\n"
 msgid "Can't get text part\n"
 msgstr "Nedá sa získať časť textu\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Súbor %s neexistuje\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Nedá sa zistiť dĺžka súboru %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Písanie správy%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 #, fuzzy
 msgid "Empty subject"
 msgstr "Predmet"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "nedá sa získať zoznam príjemcov."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1661,21 +1661,21 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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:3027
+#: src/compose.c:3035
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1686,12 +1686,12 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1700,15 +1700,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1717,85 +1717,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "nedá sa odstrániť stará správa\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "zaraďujem správu do fronty...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "nemôžem nájsť priečinok Na odoslanie\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "nemôžem zaradiť správu do fronty\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "vygenerovaný Message-ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Vytváram okno pre písanie správy...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Nástroje/A_kcie"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "MIME typ"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1805,52 +1805,52 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -2009,12 +2009,12 @@ msgstr "Upraviť priečinok"
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
@@ -2183,42 +2183,42 @@ msgstr "Spoolovací priečinok"
 msgid "Select folder"
 msgstr "Zvoľte priečinok"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Prijaté"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Odoslané"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Na odoslanie"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Odpadkový kôš"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "Nový Priečinok"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať `%c'."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nedá sa vytvoriť priečinok `%s'."
@@ -2310,56 +2310,56 @@ msgstr "Nastavujem informácie o priečinku...\n"
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom priečinkov"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Strom priečinkov bude obnovený. Pokračovať?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom priečinku..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Obnova stromu priečinku sa nepodarila."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Priečinok %s je zvolený\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2369,26 +2369,26 @@ msgstr ""
 "(Ak chcete vytvoriť priečinok s ďalšími podzložkami,\n"
 "pridajte na koniec názvu '/')"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nový názov pre `%s':"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2397,12 +2397,12 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Odstrániť priečinok"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2413,21 +2413,21 @@ msgstr ""
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2436,34 +2436,34 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 
@@ -2609,144 +2609,144 @@ msgstr "Dokončiť"
 msgid "Sylpheed: %d new messages"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autentizácia"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Prijímam nové správy"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Čakajte"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Zrušené"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Prijímam"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hotovo (%d správ (%s) prijatých)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Hotovo (žiadne nové správy)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Autentizácia zlyhala"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Zamknuté"
 
-#: src/inc.c:727
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (v sekundách)"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončené (%d nových správ)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Dokončené (žiadne nové správy)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Pri prijímaní pošty sa vyskytli chyby."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "prijímam nové správy pre konto %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autentizácia"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Pripájam sa k serveru POP3: %s..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Autentizácia..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Prijímam správy z %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Odstraňujem správu %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Odpájam sa"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Prijímam (%d správ (%s) prijatých)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Spojenie zlyhalo."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2755,28 +2755,28 @@ msgstr ""
 "Pri spracovávaní pošty sa vyskytla chyba:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Nedá sa zapisovať do súboru."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Chyba socketu."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Mailbox je zamknutý."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2785,11 +2785,11 @@ msgstr ""
 "Mailbox je zamknutý:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Autentizácia bola neúspešná."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2798,16 +2798,16 @@ msgstr ""
 "Autentizácia bola neúspešná:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 #, fuzzy
 msgid "Session timed out."
 msgstr "čas spojenia vypršal\n"
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Prijímam nové správy z %s do %s...\n"
@@ -2934,7 +2934,7 @@ msgstr "Správy vo fronte"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2943,701 +2943,702 @@ msgstr ""
 "Podpora OpenPGP je vypnutá."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "už beží iná kópia Sylpheedu.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Nastavenie akcií"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Súbor/P_riečinok"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Súbor/P_riečinok/Vytvoriť _nový priečinok..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Súbor/P_riečinok/P_remenovať priečinok..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Súbor/P_riečinok/P_remenovať priečinok..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Súbor/P_riečinok/O_dstrániť priečinok"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Súbor/_Pridať schránku..."
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Súbor/_Pridať schránku..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Odstrániť schránku"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Súbor/P_riečinok/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/P_rijať nové správy"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 #, 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:531
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/O_bnoviť štruktúru priečinkov"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Súbor/_Importovať súbor mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Súbor/_Exportovať do súboru mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Súbor/Vyčistiť odpadkový _kôš"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Súbor/_Uložiť ako..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Súbor/_Uložiť ako..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Súbor/_Tlačiť..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Súbor/P_racovať odpojený"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Súbor/Uk_ončiť"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/Ú_pravy/Zvoliť _vlákno"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/Vy_hľadať v aktuálnej správe..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/Ú_pravy/_Vyhľadať v správach..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Zobraziť/_Ukázať alebo skryť"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Strom priečinkov"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Zobrazenie správy"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 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:570
+#: src/mainwindow.c:572
 #, 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:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Ikony"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Text"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/Žiad_ne"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/Stavový _riadok"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/Stavový _riadok"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Zobraziť/Samostatný str_om priečinkov"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Zobraziť/Samostatné zobraz_enie správy"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Zobraziť/_Triediť"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Zobraziť/_Triediť/podľa čí_sla"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Zobraziť/_Triediť/podľa _veľkosti"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Zobraziť/_Triediť/podľa _dátumu"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Zobraziť/_Triediť/podľa _dátumu"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Zobraziť/_Triediť/podľa _odosielateľa"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Zobraziť/_Triediť/podľa _príjemcu"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Zobraziť/_Triediť/podľa p_redmetu"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Zobraziť/_Triediť/podľa _farebného označenia"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Zobraziť/_Triediť/podľa _značky"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Zobraziť/_Triediť/podľa pr_ečítania"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Zobraziť/_Triediť/podľa prí_loh"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Zobraziť/_Triediť/_Netriediť"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Zobraziť/_Triediť/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Zobraziť/_Triediť/Vzostupne"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Zobraziť/_Triediť/Zos_kupiť podľa predmetu"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Zobraziť/Zobraziť _vlákna"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Zobraziť/_Rozbaliť všetky vlákna"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Zobraziť/Zba_liť všetky vlákna"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Zobraziť/Nastav_iť zobrazované položky"
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Zobraziť/Pre_jsť na"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Zobraziť/Pre_jsť na/_Predošlú správu"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Zobraziť/Pre_jsť na/Ď_alšiu správu"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Zobraziť/Pre_jsť na/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Zobraziť/Pre_jsť na/P_redošlú neprečítanú správu"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu n_eprečítanú správu"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú no_vú správu"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalši_u novú správu"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú _označenú správu"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu o_značenú správu"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú správu s návestí_m"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 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:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Zobraziť/_Kódovanie/_Automatické"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Zobraziť/_Kódovanie/Čínština (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Zobraziť/Otvoriť v _novom okne"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Zobraziť/Zdrojový kód správ_y"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Zobraziť/Všetky _hlavičky"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/Sp_ráva"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/Sp_ráva/_Prijať"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Sp_ráva/_Prijať/Z _aktuálneho konta"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Sp_ráva/_Prijať/Zo _všetkých kônt"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/Sp_ráva/_Prijať/_Ukončiť prijímanie"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/Sp_ráva/_Prijať/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/Sp_ráva/_Odoslať správy vo fronte"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/Sp_ráva/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/Sp_ráva/_Napísať novú správu"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/Sp_ráva/O_dpovedať"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/Sp_ráva/Odpo_vedať komu"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Sp_ráva/Odpoved_ať komu/_všetkým"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Sp_ráva/Od_povedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Sp_ráva/Od_povedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/Sp_ráva/_Poslať ďalej"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/Sp_ráva/Poslať ako p_rílohu"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/Sp_ráva/Pre_smerovať"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/Sp_ráva/Pres_unúť"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/Sp_ráva/_Kopírovať"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/Sp_ráva/O_značiť"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Sp_ráva/O_značiť/O_značiť"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Sp_ráva/O_značiť/O_dznačiť"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/Sp_ráva/O_značiť/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _neprečítané"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _prečítané"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _prečítané"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Sp_ráva/O_značiť/Označiť _všetky ako prečítané"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/Sp_ráva/Z_mazať"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/Sp_ráva/_Odoslať"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/Sp_ráva/Znovu _editovať"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Nástroje/Pridať _odosielateľa do adresára"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/_Automaticky"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _odosielateľa"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _príjemcu"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa p_redmetu"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/Zmazať du_plikátne správy"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Vykonať označený proces"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamu"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/Nastav_enia"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_enia/_Všeobecné nastavenia..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Nastav_enia/Nastavenie _filtru..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/Nastav_enia/Š_ablóna..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_enia/_Akcie..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/Nastav_enia/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_enia/Nastavenia aktívneho _konta..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_enia/Vytvoriť _nové konto..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_enia/_Upraviť kontá..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_enia/_Zmeniť aktívne konto"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/Nápo_veda/_Manuál"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/Nápo_veda/_Manuál/_Anglicky"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Nápo_veda/_Manuál/_Japonsky"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/Nápo_veda/_FAQ"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/Nápo_veda/_FAQ/_Anglicky"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/Nápo_veda/_FAQ/_Japonsky"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Nápo_veda/_FAQ/Š_panielsky"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/Nápo_veda/_FAQ/_Francúzky"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Nápo_veda/_FAQ/_Taliansky"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/Nápo_veda/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Vytváram hlavné okno...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Bez názvu"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "žiadny"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Mením typ oddeľovača okien z %d na %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Odpojené"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Ste odpojený. Pripojiť sa?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3648,16 +3649,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3667,72 +3668,72 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr "Ste odpojený. Kliknite na ikonu, ak sa chcete pripojiť."
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "Ste pripojený. Kliknite na ikonu, ak sa chcete odpojiť."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 #, fuzzy
 msgid "Command line options"
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3748,7 +3749,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3971,7 +3972,7 @@ msgstr "Konto%d"
 msgid "Preferences for new account"
 msgstr "Nastavenie nového konta"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Nastavenie konta"
 
@@ -3984,7 +3985,7 @@ msgid "Receive"
 msgstr "Prijať"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Odoslať"
 
@@ -4207,7 +4208,7 @@ msgstr "Autentizovať cez POP3 pred odosielaním"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Podpis"
 
@@ -4673,7 +4674,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Editor"
 
@@ -5835,7 +5836,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Zmazať [...] alebo (...) na začiatku názvu v zozname správ"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
@@ -6052,81 +6053,91 @@ msgstr "Tlačiť"
 msgid "Print message"
 msgstr "Odoslať správu"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Posun"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Server pre prijímanie"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Vykonať"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Vykonať označený proces"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Nastavenia"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Všeobecné nastavenia"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Odoslať správu"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Odoslať neskôr"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do priečinka Na odoslanie a odoslať neskôr"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Koncept"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Vložiť"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Vložiť obsah súboru"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Pripojiť"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 #, fuzzy
 msgid "Append signature"
 msgstr "CHYBNÝ podpis"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Riadkovanie"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6382,7 +6393,7 @@ msgstr "Nebol nájdený žiadny podpis"
 msgid "Good signature from \"%s\""
 msgstr "Správny podpis od \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Správny podpis"
 
@@ -6391,7 +6402,7 @@ msgstr "Správny podpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6428,7 +6439,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "CHYBNÝ podpis od \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "CHYBNÝ podpis"
 
@@ -6884,46 +6895,50 @@ msgstr "súbor %s už existuje\n"
 msgid "Creating text view...\n"
 msgstr "Vytváram zobrazenie textu...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Táto správa sa nedá zobraziť.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Uložiť ako..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napísať novú správu"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Pridať odosielateľa do _adresára"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Spoločná adresa"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Webový prehliadač"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6932,7 +6947,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index f89f1590..acc0c016 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+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"
@@ -52,167 +52,167 @@ msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 msgid "Moving messages %s to %s ..."
 msgstr "Prestavljam sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne morem nastaviti izbrisanih zastavic: %d\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "ne morem izbrisati\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne morem nastaviti izbrisanih zastavic: 1:%d\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Datoteka z oznakami ni bila najdena.\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "med dobivanjem LIST je prišlo do napake.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ne morem narediti '%s'\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ne morem narediti '%s' pod mapo Prejeto\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne morem narediti poštnega predala: LIST ni uspel\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "ne morem narediti poštnega predala\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, 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:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "ne morem izbrisati poštnega predala\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "ne morem dobiti ovojnice\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "med dobivanjem ovojnice je prišlo do napake.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne morem razčleniti ovojnice: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, 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:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "ne morem dobiti imenskega prostora\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Overovitvena metoda"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "Prijava na IMAP4 ni uspela.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne morem pripeti %s na %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(pošiljam datoteko...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne morem dodati sporočila %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne morem kopirati %d na %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, 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:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne more pretvoriti %s v UTF-7\n"
@@ -304,20 +304,20 @@ msgstr "Izvažam sporočila iz %s v %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "ne morem prepisati sporočila %s v %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Ne morem odpreti označene datoteke.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "Izvorna mapa je identična ciljni.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -326,7 +326,7 @@ msgstr ""
 "Datoteka `%s' že obstaja.\n"
 "Ne morem narediti imenika."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -600,12 +600,12 @@ msgstr "  Zadeva: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Izdajatelj: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "pisanje v %s ni uspelo.\n"
@@ -689,7 +689,7 @@ msgstr ""
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -824,7 +824,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Naslov"
 
@@ -837,7 +837,7 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -860,9 +860,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
@@ -884,11 +884,11 @@ msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
@@ -925,7 +925,7 @@ msgstr "/_Naslov/_Urejanje"
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Orodja"
@@ -934,12 +934,12 @@ msgstr "/_Orodja"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
@@ -986,7 +986,7 @@ msgstr "/_Uredi/_Prilepi"
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Imenik naslovov"
 
@@ -1051,7 +1051,7 @@ msgstr ""
 "Ali res želite izbrisati mapo IN vse naslove v '%s' ? \n"
 "Če izbrišete samo mapo, se bodo vsi naslovi prestavili v starševsko mapo."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
@@ -1210,15 +1210,15 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Opomba"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Napaka"
 
@@ -1324,7 +1324,7 @@ msgstr "/_Uredi/_Razveljavi"
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Obnovi"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
@@ -1337,7 +1337,7 @@ msgstr "/_Uredi/I_zreži"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/Prilepi kot _citat"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Izberi _vse"
 
@@ -1354,7 +1354,7 @@ msgstr "/_Uredi/_Prelomi vse _dolge vrstice"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Pogled"
@@ -1376,9 +1376,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Ogled/_Odgovor za"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Pogled/---"
 
@@ -1399,7 +1399,7 @@ msgstr "/_Pogled/_Priloga"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
@@ -1411,138 +1411,138 @@ msgstr ""
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pogled/Nabor zna_kov/7 bitni ASCII (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Videz/Nabor zna_kov/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pogled/Nabor zna_kov/Srednjeevropski (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pogled/Nabor zna_kov/_Baltski (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pogled/Nabor zna_kov/Turški (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pogled/Nabor zna_kov/Korejski (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
@@ -1550,13 +1550,13 @@ msgstr "/_Orodja/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
@@ -1595,71 +1595,71 @@ msgstr "%s: datoteka ne obstaja\n"
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 #, fuzzy
 msgid "Empty subject"
 msgstr "Zadeva"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1667,21 +1667,21 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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:3027
+#: src/compose.c:3035
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1691,12 +1691,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1705,15 +1705,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1722,86 +1722,86 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1811,52 +1811,52 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 #, 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:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -2014,12 +2014,12 @@ msgstr "Urejanje mape"
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -2187,42 +2187,42 @@ msgstr "Imenik spool"
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Prejeto"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Poslano"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Čakajoče"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Smeti"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "Nova mapa"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Znaka '%c' ne more biti v imenu mape."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mapa '%s' že obstaja."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne morem narediti mape '%s'."
@@ -2314,57 +2314,57 @@ msgstr "Nastavljam informacije o mapi...\n"
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Ponovno zgradi drevo map"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Preverjam nova sporočila v vseh mapah..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mapa %s je izbrana\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2374,26 +2374,26 @@ msgstr ""
 "(če želite narediti mapo za shranjevanje podmap,\n"
 "dodajte '/' na koncu imena datoteke)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Vnesite novo ime za '%s':"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2402,12 +2402,12 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Izbriši mapo"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2418,21 +2418,21 @@ msgstr ""
 "Vse mape in sporočila pod '%s' bodo izbrisana.\n"
 "Ali jih res želite izbrisati?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2441,34 +2441,34 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbrišem račun IMAP4 '%s'?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Izbriši račun IMAP4"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbrišem novičarsko skupino '%s'?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Izbriši novičarsko skupino"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbrišem novičarski račun '%s'?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Izbriši novičarski račun"
 
@@ -2614,200 +2614,200 @@ msgstr "Končaj"
 msgid "Sylpheed: %d new messages"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Overovljam"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Prenašam nova sporočila"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "V pripravljenosti"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Prenašam"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Opravljeno (ni novih sporočil)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Overovitev ni uspela"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Zaklenjeno"
 
-#: src/inc.c:727
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Čas izteka (sek.)"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Končano (%d novih sporočil)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Končano (ni novih sporočil)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Med prejemanjem pošte je prišlo do nekaterih napak."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "sprejemam nova sporočila z računa %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Overovljam"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prenašam nova sporočila"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se s strežnikom POP: %s"
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne morem se povezati s strežnikom POP: %s%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Overovljam..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Ugotavljam število novih sporočil (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Ugotavljam število novih sporočil (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Ugotavljam število novih sporočil (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Ugotavljam velikost sporočil (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem sporočilo %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Zapuščam"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prenašam sporočilo (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Opravljeno (%d sporočil (%s) prejetih)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 #, fuzzy
 msgid "Connection failed."
 msgstr "Povezava ni uspela"
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Na disku ni prostora."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Ne morem napisati datoteke."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "napaka v priključku."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Poštni predal je zaklenjen."
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Overovitvena metoda"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Pripojitev odpovedana\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Pobiram nova sporočila iz %s v %s...\n"
@@ -2932,7 +2932,7 @@ msgstr "Čakajoča sporočila"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nekaj neposlamih sporočil je na čakanju. Ali naj končam?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2941,708 +2941,708 @@ msgstr ""
 "Podpora za OpenPGP je izključena."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed že teče.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem nastavitve dejanj..\n"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Mapa"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Mapa/Naredi _novo mapo..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Mapa/_Preimenuj mapo..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datoteka/_Mapa/_Preimenuj mapo..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Mapa/I_zbriši mapo"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/_Dodaj poštni predal..."
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/_Dodaj poštni predal..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Odstrani poštni pre_dal"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Mapa"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Preveri nova sporočila"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Datoteka/_Preveri nova sporočila v vseh imenikih"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Ponovno z_gradi drevo map"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Uvozi datoteko mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvozi v datoteko mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datoteka/Izprazni sme_tnjak"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/_Shrani kot..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Datoteka/_Shrani kot..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/_Natisni..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/Datoteka/Vr_ini datoteko"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/_Končaj"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Uredi/Izberi _nit"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Urejanje/_Iskanje v trenutnem sporočilu..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Urejanje/Iskanje _sporočil"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Pogled/Pri_kaži ali skrij"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Drevo map"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Ogled sporočila"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 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:570
+#: src/mainwindow.c:572
 #, 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:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Ikone"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pogled/Pri_kaži ali skrij/O_rodjarna/_Besedilo"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Orodjarna/_Nič"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Statusna vrstica"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pogled/Pri_kaži ali skrij/_Statusna vrstica"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "_Pogled/Posebno drev_o map"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pogled/Poseben ogled _sporočila"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Pogled/_Razvrščanje"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Pogled/_Razvrščanje/po š_tevilu"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Pogled/_Razvrščanje/po _velikosti"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Pogled/_Razvrščanje/po _datumu"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Pogled/_Razvrščanje/po _datumu"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Pogled/_Razvrščanje/po _pošiljatelju"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Pogled/_Razvrščanje/po naslovnik_u"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Pogled/_Razvrščanje/po _zadevi"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Pogled/_Razvrščanje/po _barvi oznak"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Pogled/_Razvrščanje/po _oznaki"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Pogled/_Razvrščanje/po _neprebranih"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Pogled/_Razvrščanje/po pri_logi"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Pogled/_Razvrščanje/Ne raz_vrsti"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Pogled/_Razvrščanje/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pogled/_Razvrščanje/N_araščajoče"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Pogled/_Razvrščanje/Pri_vlači po zadevi"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Pogled/Ogled _niti"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Pogled/Razširi _vse niti"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pogled/Skrči vse _niti"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Pogled/Nastavi kos za _prikaz..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Pogled/_Pojdi na"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Pogled/_Pojdi na/_Prejšnje sporočilo"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Pogled/_Pojdi na/_Naslednje sporočilo"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Pogled/_Pojdi na/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Pogled/_Pojdi na/Pre_jšnje neprebrano sporočilo"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Pogled/_Pojdi na/Nas_lednje neprebrano sporočilo"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje no_vo sporočilo"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Pogled/_Pojdi na/Nasled_nje novo sporočilo"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje _označeno sporočilo"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Pogled/_Pojdi na/Naslednje o_značeno sporočilo"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Pogled/_Pojdi na/Prejšnje sporočilo z ozna_ko"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Pogled/_Pojdi na/Naslednje sporočilo z oznako"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pogled/Nabor zna_kov/_Samodejno"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pogled/Nabor zna_kov/Kitajski (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pogled/Kodni nabor/Korejski (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Poglej/Odpri v _novem oknu"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Pogled/I_zvirnik sporočila"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Pogled/Vsa _zaglavja"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Sporočilo"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "_Sporočilo/Poberi z vseh _računov"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:755
 #, fuzzy
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Sporočilo/Odpoved sprejeman_ja"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Sporočilo/Pošlji čakajoča sporoč_ila"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Sporočilo/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Sporočilo/_Novo sporočilo"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Sporočilo/_Odgovori"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Sporočilo/Odgovor _na"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Sporočilo/Odgovor _na/_vsem"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Sporočilo/Odgovori _na/_pošiljatelju"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Sporočilo/Odgovor _na/_dopisni seznam"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/Sporočilo/_Posreduj"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Sporočilo/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Sporočilo/Pre_usmeri"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Sporočilo/Pres_tavi..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Sporočilo/_Kopiraj..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Sporočilo/O_znači"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Sporočilo/O_znači/_Označi"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Sporočilo/O_znači/O_dznači"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Sporočilo/O_znači/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Sporočilo/O_znači/Označi kot _neprebrano"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Sporočilo/O_znači/Označi kot _prebrano"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Sporočilo/O_znači/Označi kot _prebrano"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Sporočilo/O_znači/Označi _vsa kot prebrana"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Sporočilo/Z_briši"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Sporočilo/_Poberi novo pošto"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Sporočilo/Znova ur_edi"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Orodja/Doda_j pošiljatelja v adresar"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/S_amodejno"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po p_ošiljatelju"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _naslovniku"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Orodja/_Ustvari pravilo za filtriranje/po _zadevi"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Orodja/_Filtriraj sporočila"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Orodja/_Briši podvojena sporočila"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Izvedi označen proces"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Orodja/_Dnevniško okno"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Prikrojitev"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Prikrojitev/_Splošne nastavitve..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Prikrojitev/_Nastavitve _filtra..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Prikrojitev/_Predloga..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Prikrojitev/_Dejanja..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Prikrojitev/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Prikrojitev/_Nastavitve za trenutni _račun..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Prikrojitev/Naredi _nov račun..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Prikrojitev/_Uredi račune..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Prikrojitev/Spremeni _trenutni račun"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Pomoč/_Priročnik"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoč/_Priročnik/_Angleščina"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoč/_Priročnik/_Japonščina"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Angleščina"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Nemščina"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/Š_panščina"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Francoščina"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoč/Pogosto _zastavljena vprašanja/_Italijanščina"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Pomoč/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Ustvarjam glavno okno...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Brez naslova"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "nič"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Spreminjam tip ločevanja oken z %d na %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Izprazni smetnjak"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Dodaj poštni predal"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3653,16 +3653,16 @@ msgstr ""
 "Če je določen obstoječi poštni predal,\n"
 "bo pregledan samodejno."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3671,72 +3671,72 @@ msgstr ""
 "Izdelava poštnega predala ni uspela.\n"
 "Morda obstajajo nekatere datoteke ali pa tam nimate dovoljenja za pisanje."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Syčpheed - ogled mape"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori vsem"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Končaj"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Ali naj končam ta program?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 #, fuzzy
 msgid "Command line options"
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uporaba: %s [MOŽNOST]...\n"
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3752,7 +3752,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3975,7 +3975,7 @@ msgstr "Račun%d"
 msgid "Preferences for new account"
 msgstr "Nastavitve novega računa"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Nastavitve računa"
 
@@ -3988,7 +3988,7 @@ msgid "Receive"
 msgstr "Sprejmi"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Pošlji"
 
@@ -4210,7 +4210,7 @@ msgstr "Pred pošiljanjem avtenticiraj s POP3"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Podpis"
 
@@ -4672,7 +4672,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Urejevalnik"
 
@@ -5838,7 +5838,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
@@ -6054,81 +6054,91 @@ msgstr "Tiskanje"
 msgid "Print message"
 msgstr "Pošlji sporočilo"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Korak"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Strežnik za sprejemanje"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Izvedi"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Izvedi označen proces"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Nastavitve"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Splošne preference"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Pošlji sporočilo"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Pošlji kasneje"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Postavi v mapo Čakajoče in pošlji kasneje"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Osnutek"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Vstavi"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Vstavi datoteko"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Pripni"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Pripni datoteko"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 #, fuzzy
 msgid "Append signature"
 msgstr "SLAB podpis"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Urejanje z zunanjim urejevalnikom"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Prelom vrstic"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Prelomi vse dolge vrstice"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Pogled/_Pojdi na/_Druga mapa"
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6382,7 +6392,7 @@ msgstr "Noben podpis ni bil najden"
 msgid "Good signature from \"%s\""
 msgstr "Dober podpis od \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Dober podpis"
 
@@ -6391,7 +6401,7 @@ msgstr "Dober podpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6428,7 +6438,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "SLAB podpis od \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "SLAB podpis"
 
@@ -6886,47 +6896,51 @@ msgstr "Datoteka %s že obstaja\n"
 msgid "Creating text view...\n"
 msgstr "Ustvarjam ogled besedila...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "sporočilo ne bo sprejeto\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Shrani kot..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Doda_j pošiljatelja v adresar"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Skupni naslov"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Spletni brskalnik"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6935,7 +6949,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 2041edc2..7fe66918 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -53,167 +53,167 @@ msgstr "Šaljem poruku (%d / %d bajtova)"
 msgid "Moving messages %s to %s ..."
 msgstr "Pomeram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne mogu postaviti obrisane oznake: %d\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "ne mogu obrisati\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne mogu odabrati direktorijum: %s\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Označena datoteka ne postoji.\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "došlo je do greške prilikom dohvatanja LISTe.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "ne mogu kreirati '%s'\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "ne mogu kreirati '%s' ispod INBOX\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne mogu kreirati sanduče: LIST nije uspeo\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "ne mogu kreirati sanduče\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne mogu promeniti ime sandučeta %s u %s\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "ne mogu obrisati sanduče\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "ne mogu dobiti omot\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "došlo je do greške prilikom dobijanja omota.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati omot: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne mogu se povezati sa IMAP4 serverom: %s:%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 serverom: %s:%d\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti namespace\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu odabrati direktorijum: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Način provere identieta"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login nije uspeo.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu dodati %s na %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(šaljem datoteku...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu dodati poruku %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "grečka prilikom imap naredbe: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne može prebaciti UTF-7 to %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne može prebaciti %s to UTF-7\n"
@@ -305,20 +305,20 @@ msgstr "Izvozim poruke iz %s u %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "ne mogu kopirati poruku %s u %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Ne mogu otvoriti označenu datoteku.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "izvorni direktorijum jednak je destinaciji.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -327,7 +327,7 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu napraviti direktorijum."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -601,12 +601,12 @@ msgstr "  Tema: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Izdavač: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "pisanje u %s nije uspelo.\n"
@@ -689,7 +689,7 @@ msgstr ""
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -824,7 +824,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Adresa"
 
@@ -837,7 +837,7 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -860,9 +860,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _server"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
@@ -884,11 +884,11 @@ msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
@@ -925,7 +925,7 @@ msgstr "/_Adresa/_Izmeni"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
@@ -934,12 +934,12 @@ msgstr "/_Alati"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
@@ -986,7 +986,7 @@ msgstr "/_Izmeni/U_baci"
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Adresar"
 
@@ -1052,7 +1052,7 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
@@ -1204,15 +1204,15 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Obaveštenje"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Greška"
 
@@ -1318,7 +1318,7 @@ msgstr "/_Izmeni/_Undo"
 msgid "/_Edit/_Redo"
 msgstr "/_Izmeni/_Redo"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Izmeni/---"
@@ -1331,7 +1331,7 @@ msgstr "/_Izmeni/S_eci"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Izmeni/Ubaci kao _citat"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Izmeni/Odaberi _sve"
 
@@ -1348,7 +1348,7 @@ msgstr "/_Izmeni/Sažmi sve dugačke _linije"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Pregled"
@@ -1370,9 +1370,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Pregled/_Odgovori"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Pregled/---"
 
@@ -1393,7 +1393,7 @@ msgstr "/_Pregled/_Spajalica"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
@@ -1405,138 +1405,138 @@ msgstr ""
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pregled/_Znakovni standard/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Pregled/_Znakovni standard/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pregled/_Znakovni standard/Srednja Evropa (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pregled/_Znakovni standard/_Baltik (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Pregled/_Znakovni standard/Baltik (ISO-8859-_4)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pregled/_Znakovni standard/Grčka (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pregled/_Znakovni standard/Turska (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (KOI8-_R)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pregled/_Znakovni standard/Ćirilica (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pregled/_Znakovni standard/Pojednostavljeni Kineski (_GB2312)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pregled/_Znakovni standard/Thai (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pregled/_Znakovni standard/Thai (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Alat/_Adresar"
 
@@ -1544,13 +1544,13 @@ msgstr "/_Alat/_Adresar"
 msgid "/_Tools/_Template"
 msgstr "/_Alat/_Šablon"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Alati/---"
@@ -1589,71 +1589,71 @@ msgstr "%s: datoteka ne postoji\n"
 msgid "Can't get text part\n"
 msgstr "Ne mogu dobiti deo teksta\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Greška u formatu citata."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Greška u poruci odgovori/prosledi."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne mogu pročitati %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Poruka: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Pisanje poruke%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 #, fuzzy
 msgid "Empty subject"
 msgstr "Tema"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tema je prazna. Ipak poslati?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1661,22 +1661,22 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Ne mogu pronaći nijedan ključ kome je trenutno dodeljen id ključa `%s'."
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1686,12 +1686,12 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1700,15 +1700,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1717,86 +1717,86 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1806,52 +1806,52 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2009,12 +2009,12 @@ msgstr "Izmeni direktorijum"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -2182,42 +2182,42 @@ msgstr "Spool direktorijum"
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Poslato"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "NoviDir"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uvršten u ime direktorijuma."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' već postoji."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu napraviti direktorijum `%s'."
@@ -2309,57 +2309,57 @@ msgstr "Postavljam info direktorijuma...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "/O_sveži stablo direktorijuma"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Proveravanje novih poruka u svim direktorijumima..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Direktorijum %s je odabran\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2369,26 +2369,26 @@ msgstr ""
 "(ukoliko želite napraviti direktorijum za smeštanje poddirektorijuma,\n"
 "dodajte `/' na kraj imena)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Preimenuj direktorijum"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2397,12 +2397,12 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši direktorijum"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2413,21 +2413,21 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' biće obrisane.\n"
 "Želite li ih zaista obrisati?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2436,34 +2436,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 nalog"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Obriši news nalog"
 
@@ -2609,200 +2609,200 @@ msgstr "Gotovo"
 msgid "Sylpheed: %d new messages"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Provera identiteta"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Primam nove poruke"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Standby"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Primam"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Identifikacija nije uspela"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Zaključano"
 
-#: src/inc.c:727
+#: src/inc.c:730
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (sek)"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Završeno (%d novih poruka)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Nema nepročitanih poruka"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Došlo je do grešaka prilikom primanja pošte."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "primam nove poruke za nalog %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Provera identiteta"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Primam nove poruke"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, fuzzy, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Povezujem se na POP3 server: %s ..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 server: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Preuzimam broj novih poruka (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Preuzimam broj novih poruka (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Preuzimam broj novih poruka (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Preuzimam veličinu poruka (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Brišem poruke %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Izlazim"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, fuzzy, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Gotovo (%d poruke/a (%s) primljeno)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 #, fuzzy
 msgid "Connection failed."
 msgstr "Veza nije ostvarena"
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Nema više mesta na disku."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Ne mogu pisati u datoteku."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Protokol greška."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Način provere identieta"
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Način provere identieta"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr ""
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Incorporation otkazano\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Primam nove poruke od %s u %s...\n"
@@ -2927,7 +2927,7 @@ msgstr "Odložene poruke"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlate poruke su odložene. Izaći odmah?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2936,709 +2936,709 @@ msgstr ""
 "OpenPGP podrška je onemogućena."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pisanje konfiguracije za akcije...\n"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Datoteka/_Direktorijum"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datoteka/_Direktorijum/Kreiraj _novi direktorijum..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datoteka/_Direktorijum/_Preimenuj direktorijum..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Datoteka/_Direktorijum/_Preimenuj direktorijum..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datoteka/_Direktorijum/_Obriši direktorijum"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 #, fuzzy
 msgid "/_File/_Mailbox"
 msgstr "/_Datoteka/Dodaj _sanduče..."
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 #, fuzzy
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Datoteka/Dodaj _sanduče..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 #, fuzzy
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 #, fuzzy
 msgid "/_File/_Mailbox/---"
 msgstr "/_Datoteka/_Direktorijum"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 #, fuzzy
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Proveri ima li novih poruka"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 #, fuzzy
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/_Datoteka/_Proveri nove poruke u svim direktorijumima"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 #, fuzzy
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Osv_eži stablo direktorijuma"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datoteka/_Unos mbox datoteku..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datoteka/_Izvoz u mbox datoteku..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 #, fuzzy
 msgid "/_File/Empty all _trash"
 msgstr "/_Datotkea/Isprazni s_meće"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Datoteka/Snimanje _kao..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Datoteka/Snimanje _kao..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Datoteka/Štampanje..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 #, fuzzy
 msgid "/_File/_Work offline"
 msgstr "/_Datoteka/_Unesi datoteku"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Datoteka/I_zlaz"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Izmene/Odaberi _thread"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Izmne/P_retraga u trenutnoj poruci..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Izmene/_Traži poruke..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Pregled/Prikaži ili s_kloni"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Drvo direktorijuma"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Pregled poruka"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka za alat"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/Ikon_e i text"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ikone"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ikone"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Tekst"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Pregled/Prikaži ili s_kloni/_Traka alata/_Ništa"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Pregled/Prikaži ili s_kloni/Stat_us traka"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Pregled/Prikaži ili s_kloni/Stat_us traka"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Pregled/Odvoji sta_blo direktorijuma"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Pregled/Odvoji pre_gled poruka"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Pregled/_Složi"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Pregled/_Složi/po _broju"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Pregled/_Složi/po _veličini"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Pregled/_Složi/po _datumu"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Pregled/_Složi/po _datumu"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Pregled/_Složi/po _pošiljaocu"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 #, fuzzy
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Pregled/_Složi/po _veličini"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Pregled/_Složi/po _temi"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Pregled/_Složi/po oznaci bo_je"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Pregled/_Složi/po _oznaci"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Pregled/_Složi/po _nepročitanom"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Pregled/_Složi/po dodat_ku"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Pregled/_Složi/Nemoj složiti"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Pregled/_Složi/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Pregled/_Složi/Rastuće"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Pregled/_Složi/Privuci po te_mi"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Pregled/Th_read izgled"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Pregled/Proširi kompletan t_hread"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Pregled/Skupi komp_letan thread"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Pregled/Postavi po_jedinosti prikaza..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Pregled/_Idi do"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Pregled/_Idi do/_Prethodne poruke"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Pregled/_Idi do/_Sledeće poruke"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Pregled/_Idi do/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Pregled/_Idi do/Prethodne _nepročitane poruke"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Pregled/_Idi do/S_ledeće nepročitane poruke"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Pregled/_Idi do/Prethodne n_ove poruke"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Pregled/_Idi do/Sledeće no_ve poruke"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Pregled/_Idi do/Prethodne oz_načene poruke"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Pregled/_Idi do/Sledeće o_značene poruke"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Pregled/_Idi do/Prethodne etiketirane poruke"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Pregled/_Idi do/Sledeće etiketirane poruke"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Pregled/_Znakovni standard/_Auto detekcija"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Pregled/_Znakovni standard/Zapadna Evropa (ISO-8859-15)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Pregled/_Znakovni standard/Japan (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Pregled/_Znakovni standard/Japan (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pregled/_Znakovni standard/Tradicionalni Kineski (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Iz_vor poruke"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Pregled/_Osveži rezime"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Poruka"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 #, fuzzy
 msgid "/_Message/Recei_ve"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 #, fuzzy
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Poruka/Prove_ri sa svih naloga"
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:755
 #, fuzzy
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Poruka/Prekini pri_manje"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 #, fuzzy
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Poruka/Pošalji _odložene poruke"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Poruka/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Poruka/Sastavi _novu poruku"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Poruka/O_dgovor"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Poruka/O_dgovori"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Poruka/Odgovori/svim_a"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Poruka/Odgovori/pošil_jaocu"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Poruka/Odgovori/li_sti"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Poruka/_Prosledi"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Poruka/P_rosledi kao spajalicu"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Poruka/Preus_meri"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Poruka/Premeštanje..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Poruka/_Kopiranje..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Poruka/Označi"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Poruka/O_znači/_Označi"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Poruka/O_znači/_Ukloni oznaku"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Poruka/O_znači/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Poruka/O_znači/Označi kao _nepročitano"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Poruka/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Poruka/O_znači/Označi kao _pročitano"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Poruka/O_znači/Označi sve _pročitano"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Poruka/Brisanje..."
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Poruka/Prover_i novu poštu"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Poruka/Prover_i novu poštu"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Poruka/I_zmeni/"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/_Alati/Dodaj pošiljaoca u adresar"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 #, fuzzy
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 #, fuzzy
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Alati/_Napravi pravilo za filtriranje"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/_Automatski"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Od"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _Za"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Alati/_Napravi pravilo za filtriranje/Po _temi"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/_Alati/_Filtriraj poruke"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Alati/_Obriši duple poruke"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Izvrši označene procese"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Alati/Proyor za logove"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Konfiguracija"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguracija/U_običajene postavke..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguracija/Postavke _filtera..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguracija/_Šablon..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguracija/_Akcije..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Konfiguracija/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguracija/_Postavke za trenutni nalog..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguracija/Napravi _nov nalog..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguracija/_Izmeni naloge..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguracija/Promeni _trenutni nalog"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Pomoć/_Priručnik"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Pomoć/_Priručnik/_Engleski"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Pomoć/_Priručnik/_Japanski"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/_Pomoć/_FAQ"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Pomoć/_FAQ/_Engleski"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Pomoć/_FAQ/_Nemački"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Pomoć/_FAQ/_Španski"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Pomoć/_FAQ/_Francuski"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Pomoć/_FAQ/_Italijanski"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Linija za neredbe nije podešena."
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Pomoć/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Kreiranje glavnih prozora...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "gotovo.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "ništa"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Menjanje vrste podele prozora iz %d u %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr ""
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr ""
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 #, fuzzy
 msgid "Empty all trash"
 msgstr "Isprazni smeće"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Dodaj sanduče"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3649,16 +3649,16 @@ msgstr ""
 "Ako je unešen postojeće sanduče, automatski\n"
 "će biti pretražen."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3667,72 +3667,72 @@ msgstr ""
 "Kreiranje sandučeta nije uspelo.\n"
 "Možda neke datoteke već postoje ili nemate pravo pisanja u direktoriju."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Direktorijumi"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Od_govor"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 #, fuzzy
 msgid "/Reply to _all"
 msgstr "Odgovori svima"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 #, fuzzy
 msgid "/Reply to _sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 #, fuzzy
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr ""
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr ""
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Izlaz iz ovog programa?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 #, fuzzy
 msgid "Command line options"
 msgstr "Linija za neredbe nije podešena."
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3748,7 +3748,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3971,7 +3971,7 @@ msgstr "Nalog%d"
 msgid "Preferences for new account"
 msgstr "Podešavanja za novi nalog"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Podešavanje naloga"
 
@@ -3984,7 +3984,7 @@ msgid "Receive"
 msgstr "Primanje"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Pošalji"
 
@@ -4206,7 +4206,7 @@ msgstr "Proveri identitet sa POP3 pre slanja"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Potpis"
 
@@ -4668,7 +4668,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Editor"
 
@@ -5833,7 +5833,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Nalog"
 
@@ -6049,81 +6049,91 @@ msgstr "Štampaj"
 msgid "Print message"
 msgstr "Pošalji poruku"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Korak"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Server za primanje"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Izvrši"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Izvrši označene procese"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Svojstva"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Uobičajena svojstva"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Pošalji kasnije"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Odloži u direktotijum odloženo i pošalji kasnije"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Nedovršeno"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Sačuvaj u direktorijum nedovršeno"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Unesi"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Unesi datoteku"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Prikači"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Prikači datoteku"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 #, fuzzy
 msgid "Append signature"
 msgstr "LOŠ potpis"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Izmeni sa nezavisnim ediorom"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Sažimanje"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Sažmi sve duge linije"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Pregled/_Idi do/Dru_gog direktorijuma..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6381,7 +6391,7 @@ msgstr "Nema potpisa"
 msgid "Good signature from \"%s\""
 msgstr "Dobar potpis od \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Dobar potpis"
 
@@ -6390,7 +6400,7 @@ msgstr "Dobar potpis"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6427,7 +6437,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "LOŠ potpis od \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "LOŠ potpis"
 
@@ -6884,47 +6894,51 @@ msgstr "datoteka %s već postoji\n"
 msgid "Creating text view...\n"
 msgstr "Stvaranje pregleda teksta...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 #, fuzzy
 msgid "This message can't be displayed.\n"
 msgstr "poruka neće biti primljena\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/S_ačuvaj kao"
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napiši novu poruku"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dod_aj pošiljaoca u adresar"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Uobičajene adrese"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web čitač"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6933,7 +6947,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 7693f814..15d520aa 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+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"
@@ -52,161 +52,161 @@ msgstr "Lägger till meddelande till %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "Flyttar meddelande %s till %s..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopierar meddelanden %s till %s..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Tar bort meddelanden %s"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan inte sätta borttaget-flaggor: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "kan inte utplåna\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Tar bort alla meddelanden i %s"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan inte sätta borttaget-flaggor: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "kan inte stänga mapp\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "rotmapp %s finns inte\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "fel uppstod vid hämtning av LIST.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kan inte skapa \"%s\"\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan inte skapa \"%s\" under INBOX\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan inte skapa brevlåda: LIST misslyckades\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, 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:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "kan inte ta bort brevlåda\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "kan inte hämta kuvert\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Hämtar meddelandehuvuden (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "fel uppstod vid hämtning av kuvert.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan inte tolka kuvert: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, 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:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "kan inte hämta namnutrymme\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan inte välja mapp: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "fel vid imapkommando: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-autentisering misslyckades.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-inloggning misslyckades.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan inte lägga till %s till %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(skickar fil...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kan inte lägga till meddelande till %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan inte kopiera %s till %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fel vid imapkommando: STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fel vid imapkommando: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "fel vid imapkommando: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan inte konvertera UTF-7 till %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan inte konvertera %s till UTF-7\n"
@@ -298,20 +298,20 @@ msgstr "Exporterar meddelanden från %s till %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "kan inte kopiera meddelande %s till %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Kan inte öppna markeringsfil.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "ursprungsmappen är identisk med dest.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopierar meddelande %s%c%d till %s...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -320,7 +320,7 @@ msgstr ""
 "Filen \"%s\" finns redan.\n"
 "Kan inte skapa mapp."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -596,12 +596,12 @@ msgstr "  Ärende:  %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Utfärdare: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "kan inte ändra filrättigheter\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "skrivning till %s misslyckades.\n"
@@ -686,7 +686,7 @@ msgstr ""
 "via \"Hämta alla\""
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -821,7 +821,7 @@ msgstr "Åtgärdens användarargument"
 msgid "Add Address to Book"
 msgstr "Lägg till i adressbok"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Adress"
 
@@ -834,7 +834,7 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arkiv"
@@ -857,9 +857,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Arkiv/Ny _Server"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
@@ -881,11 +881,11 @@ msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigera"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
@@ -922,7 +922,7 @@ msgstr "/A_dress/_Redigera"
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/V_erktyg"
@@ -931,12 +931,12 @@ msgstr "/V_erktyg"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
@@ -983,7 +983,7 @@ msgstr "/_Redigera/Klistra _in"
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Adressbok"
 
@@ -1049,7 +1049,7 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
@@ -1201,15 +1201,15 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Notera"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Varning"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Fel"
 
@@ -1310,7 +1310,7 @@ msgstr "/_Redigera/_Ångra"
 msgid "/_Edit/_Redo"
 msgstr "/_Redigera/Gör _om"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Redigera/---"
@@ -1323,7 +1323,7 @@ msgstr "/_Redigera/Klipp _ut"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Redigera/Klistra in som _citat"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Redigera/Markera _allt"
 
@@ -1339,7 +1339,7 @@ msgstr "/_Redigera/Bryt _långa rader"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigera/Automatisk _radbrytning"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Visa"
@@ -1361,9 +1361,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Visa/_Svara till"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Visa/---"
 
@@ -1384,7 +1384,7 @@ msgstr "/_Visa/_Bilagor"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Visa/_Teckenkodning"
 
@@ -1395,115 +1395,115 @@ msgstr "/_Visa/_Teckenkodning/_Automatisk"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visa/_Teckenkodning/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visa/_Teckenkodning/7 bitars ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visa/_Teckenkodning/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visa/_Teckenkodning/Västeuropeisk (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visa/_Teckenkodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visa/_Teckenkodning/Centraleuropeisk (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visa/_Teckenkodning/_Baltisk (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visa/_Teckenkodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visa/_Teckenkodning/Grekisk (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Visa/_Teckenkodning/Baltisk (ISO-8859-_4)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visa/_Teckenkodning/Hebreisk (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visa/_Teckenkodning/Hebreisk (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visa/_Teckenkodning/Turkisk (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (KOI8-_U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visa/_Teckenkodning/Kyrillisk (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visa/_Teckenkodning/Japansk (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visa/_Teckenkodning/Förenklad kinesisk (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visa/_Teckenkodning/Förenklad kinesisk (_GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visa/_Teckenkodning/Traditionell kinesisk (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visa/_Teckenkodning/Koreansk (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visa/_Teckenkodning/Thai (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visa/_Teckenkodning/Thai (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/V_erktyg/_Adressbok"
 
@@ -1511,13 +1511,13 @@ msgstr "/V_erktyg/_Adressbok"
 msgid "/_Tools/_Template"
 msgstr "/V_erktyg/_Mall"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/V_erktyg/_Åtgärder"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/V_erktyg/---"
@@ -1553,70 +1553,70 @@ msgstr "%s: filen finns inte\n"
 msgid "Can't get text part\n"
 msgstr "Kan inte läsa textdel\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Citationsteckensformatfel."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Formatfel vid meddelandesvar eller -vidarebefordran"
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Filen %s finns inte\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Kan inte läsa filstorlek på %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Filen %s är tom."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "kan inte läsa %s"
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Skriv%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Mottagare är inte angiven."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Tomt ämne"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Ämnesraden är tom. Skicka ändå?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "kan inte läsa mottagarlista"
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1624,22 +1624,22 @@ msgstr ""
 "Konto för att skicka post är inte specificerat.\n"
 "Välj ett e-postkonto innan du skickar."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fel uppstod när meddelandet skulle skickas till %s."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Kan inte spara meddelande i kö-mappen."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1650,11 +1650,11 @@ msgstr ""
 "\n"
 "Skicka det som %s ändå?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Fel vid konvertering av kod"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1667,15 +1667,15 @@ msgstr ""
 "\n"
 "Sänd det ändå?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Radlängdsbegränsning"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1684,83 +1684,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "kan inte ta bort det gamla meddelandet\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "lägger meddelandet i kö...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "kan inte hitta kömapp\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "kan inte lägga meddelandet i kö\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "skapat Meddelande-ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Skapar skrivfönster...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "PGP Tecken"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "MIME-typ"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Storlek"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1770,48 +1770,48 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -1968,12 +1968,12 @@ msgstr "Redigera mapp"
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet på mappen:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -2140,42 +2140,42 @@ msgstr "Välj katalog"
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Skickat"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kö"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "NyMapp"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" får inte finnas i mappnamn."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen \"%s\" finns redan."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan inte skapa mappen \"%s\"."
@@ -2264,56 +2264,56 @@ msgstr "Ställer in mappinfo...\n"
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mappträd"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Mappträdet kommer att uppdateras. Fortsätt?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mappträd..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uppdatering av mappträdet misslyckades."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelanden i alla mappar..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Skräp"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappen %s är vald\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ett fel uppstod vid nedladdning av meddelanden i \"%s\"."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2323,26 +2323,26 @@ msgstr ""
 "(om du vill skapa en mapp som skall innehålla undermappar,\n"
 " lägg till \"/\" vid slutet av namnet)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Skriv in nytt namn på \"%s\":"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan inte flytta mappen \"%s\"."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2351,12 +2351,12 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ta bort mapp"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2369,20 +2369,20 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Töm papperskorgen"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2391,34 +2391,34 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
@@ -2564,143 +2564,143 @@ msgstr "Avsluta"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d nya meddelanden"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Autentiserar"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Hämtar nya meddelanden"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Vänta"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Hämtar"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Färdig (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Färdig (inga nya meddelanden)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Förbindelse misslyckades"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Autentisering misslyckades"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Låst"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Slut på väntetid"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Avslutad (%d nya meddelanden)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Avslutad (inga nya meddelanden)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Fel uppstod vid hämtning av post."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "hämtar nya meddelanden från kontot %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Autentiserar"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Hämtar nya meddelanden"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Ansluter till POP3-server: %s ..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Kan inte ansluta till POP3-server: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Hämtar meddelanden från %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Tar emot meddelandenas antal (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Tar emot meddelandenas antal (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Tar emot meddelandenas antal (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Tar emot meddelandenas storlek (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Tar bort meddelande %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Avslutar"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Hämtar (%d meddelande(n) (%s) mottagna)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Förbindelse misslyckades."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Fel uppstod när e-posten behandlades."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2709,28 +2709,28 @@ msgstr ""
 "Fel uppstod när e-posten behandlades:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Inget diskutrymme kvar."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Kan inte skriva fil."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Fel på uttag (socket)."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Anslutningen stängdes av fjärrvärden."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Brevlådan är låst."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2739,11 +2739,11 @@ msgstr ""
 "Brevlådan är låst:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Autentisering misslyckades."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2752,15 +2752,15 @@ msgstr ""
 "Autentisering misslyckades:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Sessionens väntetid tog slut."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Inkorporering avbruten\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Hämtar nya meddelanden från %s till %s...\n"
@@ -2894,7 +2894,7 @@ msgstr "Meddelanden i kö"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Några oskickade meddelanden ligger i kö. Avsluta nu?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2903,15 +2903,15 @@ msgstr ""
 "OpenPGP-stöd avstängt."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "en annan instans av Sylpheed är redan igång.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Migration av konfiguration"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2919,660 +2919,661 @@ msgstr ""
 "Den tidigare versionen av konfigurationen hittad.\n"
 "Vill du flytta den?"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Arkiv/_Mapp"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Arkiv/_Mapp/_Ny mapp..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Arkiv/_Mapp/_Byt namn..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Arkiv/_Mapp/_Flytta..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Arkiv/_Mapp/_Ta bort"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Arkiv/_Brevlåda..."
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Arkiv/_Brevlåda/_Lägg till..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Arkiv/_Brevlåda/_Ta bort"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_Arkiv/_Brevlåda/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Arkiv/_Brevlåda/Ta emot nya _meddelanden"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 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:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Arkiv/_Brevlåda/_Uppdatera mappträd"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Arkiv/_Importera mbox-fil..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Arkiv/_Exportera till mbox-fil..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Arkiv/Töm alla _papperskorgar"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Arkiv/_Spara som..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Arkiv/_Spara som..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Arkiv/Skriv _ut..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Arkiv/Arbeta _offline"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Arkiv/_Avsluta"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Redigera/Välj _tråd"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Redigera/Sök _i aktuellt meddelande..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Redigera/_Sök meddelanden..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Visa/_Visa eller dölj"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Visa/_Visa eller dölj/_Mappträd"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Visa/_Visa eller dölj/Me_ddelandevy"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/Ikoner _och text"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, 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:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Ikoner"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/_Text"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Visa/_Visa eller dölj/_Verktygsrad/I_ngetdera"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Visa/_Visa eller dölj/_Statusrad"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visa/_Visa eller dölj/_Statusrad"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visa/Separat ma_ppträd"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/_Visa/Separat m_eddelandevy"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Visa/_Sortera"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visa/_Sortera/efter _nummer"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Visa/_Sortera/efter stor_lek"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Visa/_Sortera/efter _datum"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Visa/_Sortera/efter _tråddatum"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Visa/_Sortera/efter _från"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Visa/_Sortera/efter _mottagare"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Visa/_Sortera/efter _ämne"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visa/_Sortera/efter fä_rgmarkering"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visa/_Sortera/efter mar_kering"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Visa/_Sortera/efter _oläst"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visa/_Sortera/efter _bilaga"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visa/_Sortera/_inte alls"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Visa/_Sortera/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Visa/_Sortera/Uppstigande"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Visa/_Sortera/Nedstigande"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visa/_Sortera/_Attrahera efter ärende"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Visa/_Trådvy"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visa/E_xpandera alla trådar"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visa/Ko_llapsa alla trådar"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Visa/_Poster i summeringsvyn..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Visa/_Gå till"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Visa/_Gå till/_Föreg. meddelande"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visa/_Gå till/_Nästa meddelande"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Visa/_Gå till/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Visa/_Gå till/F_öreg. olästa meddelande"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visa/_Gå till/N_ästa olästa meddelande"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Visa/_Gå till/Föreg. n_ya meddelande"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visa/_Gå till/Näs_ta nya meddelande"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Visa/_Gå till/Föreg. _markerade meddelande"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visa/_Gå till/Nästa m_arkerade meddelande"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Visa/_Gå till/Föreg. _färgade meddelande"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visa/_Gå till/Nästa fä_rgade meddelande"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visa/_Teckenkodning/_Automatisk igenkänning"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Visa/_Teckenkodning/_Västeuropeisk (ISO-8859-15)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visa/_Teckenkodning/Japansk (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visa/_Teckenkodning/Japansk (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visa/_Teckenkodning/Japansk (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visa/_Teckenkodning/Traditionell kinesisk (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visa/_Teckenkodning/Kinesisk (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visa/_Teckenkodning/Koreansk (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Visa/_Öppna i nytt fönster"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Visa/_Meddelandekällkod"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Visa/_Hela brevhuvudet"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Meddelande"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/_Meddelande/Mott_ag"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Meddelande/Mottag/Hämta från _detta konto"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Meddelande/Mottag/Hämta från alla _konton"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Meddelande/Mottag/Avbryt hämtnin_g"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Meddelande/Mottag/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Meddelande/Skicka _köade meddelanden"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Meddelande/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Meddelande/Skriv _nytt meddelande"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Meddelande/Sva_ra"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Meddelande/_Svara till"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Meddelande/_Svara till/a_lla"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Meddelande/_Svara till/_avsändaren"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Meddelande/_Svara till/_e-postlista"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Meddelande/Vi_darebefordra"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Meddelande/Vidarebefordra som bil_aga"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Meddelande/_Omdirigera"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Meddelande/Fl_ytta..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Meddelande/_Kopiera"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Meddelande/_Markera"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Meddelande/_Markera/_Markera"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Meddelande/_Markera/_Avmarkera"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Meddelande/_Markera/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Meddelande/_Markera/Markera som _oläst"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Meddelande/_Markera/Markera som _läst"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Meddelande/_Markera/Markera som _läst"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Meddelande/_Markera/Markera alla som l_ästa"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Meddelande/_Ta bort"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Meddelande/Sätt som _skräppost"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Meddelande/Sätt som inte skr_äppost"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Meddelande/Redigera _om"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/V_erktyg/Lägg till avsändaren i adressbo_k..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/V_erktyg/_Filtrera alla meddelanden i mappen"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/V_erktyg/Filtrera _valda meddelanden"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/V_erktyg/_Skapa filterregel"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/V_erktyg/_Skapa filterregel/_Automatiskt"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Från"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Till"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/V_erktyg/_Skapa filterregel/genom _Ämne"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/V_erktyg/Filtrera _skräppost i mappen"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/V_erktyg/Filtrera skräp_post i valda meddelanden"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/V_erktyg/Ta bort meddelande_dubbletter"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Kör markerad process"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/V_erktyg/_Loggfönster"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Konfiguration"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Konfiguration/_Allmänna inställningar..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Konfiguration/_Filterinställningar..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Konfiguration/_Mall..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Konfiguration/_Åtgärder..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Konfiguration/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Konfiguration/_Inställningar för aktuellt konto..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Konfiguration/Skapa _nytt konto..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Konfiguration/_Redigera konton..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Konfiguration/_Ändra aktuellt konto"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Hjälp/_Handbok"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hjälp/_Handbok/_Engelsk"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hjälp/_Handbok/_Japansk"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/_Hjälp/_FAQ"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hjälp/_FAQ/_Engelsk"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hjälp/_FAQ/_Tysk"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hjälp/_FAQ/_Spansk"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hjälp/_FAQ/_Fransk"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hjälp/_FAQ/_Italiensk"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Kommandorad saknas."
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Hjälp/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Skapar huvudfönster...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "färdigt.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "inget"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Byter fönsterseparationstyp från %d till %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Du är frånkopplad. Vill du ansluta?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Töm alla papperskorgar"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Lägg till brevlåda"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3582,16 +3583,16 @@ msgstr ""
 "Om den existerande brevlådan specificeras, kommer den\n"
 "att sökas igenom automatiskt."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3600,69 +3601,69 @@ msgstr ""
 "Brevlådan kunde inte skapas.\n"
 "Några filer finns redan eller så saknar du skrivrättigheter där."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Mappvy"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Svara till _alla"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Svara till av_sändaren"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 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:2837
+#: src/mainwindow.c:2849
 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:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Avsluta detta program?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommandorad saknas."
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Användning: %s [FLAGGOR]...\n"
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3678,7 +3679,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3900,7 +3901,7 @@ msgstr "Konto%d"
 msgid "Preferences for new account"
 msgstr "Inställningar för nytt konto"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Kontoinställningar"
 
@@ -3913,7 +3914,7 @@ msgid "Receive"
 msgstr "Ta emot"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Skicka"
 
@@ -4129,7 +4130,7 @@ msgstr "Autentisera med POP3 innan brev skickas"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Signatur"
 
@@ -4590,7 +4591,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Redigerare"
 
@@ -5709,7 +5710,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Ta bort [...] eller (...) i början av ärendet vid svar"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
@@ -5925,81 +5926,91 @@ msgstr "Skriv ut"
 msgid "Print message"
 msgstr "Skicka meddelande"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Steg"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Server för mottagning"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Utför köade åtgärder"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Kör markerad process"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Inst."
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Allmänna inställningar"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Skicka senare"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Placera i kömapp och skicka senare"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Utkast"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Infoga"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Infoga fil"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Bifoga"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Bifoga fil"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 #, fuzzy
 msgid "Append signature"
 msgstr "FELAKTIG signatur"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Redigera med extern redigerare"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Radbrytning"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Radbryt långa rader"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Visa/_Gå till/_En annan mapp..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6255,7 +6266,7 @@ msgstr "Ingen signatur funnen"
 msgid "Good signature from \"%s\""
 msgstr "Bra signatur från \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Bra signatur"
 
@@ -6264,7 +6275,7 @@ msgstr "Bra signatur"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Giltig signatur med nyckeln för \"%s\" är inte pålitlig"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Giltig signatur (opålitlig nyckel)"
 
@@ -6300,7 +6311,7 @@ msgstr "Signaturen giltig men signerande nyckeln har återkallats"
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "FELAKTIG signatur"
 
@@ -6752,41 +6763,45 @@ msgstr "filen %s finns redan\n"
 msgid "Creating text view...\n"
 msgstr "Skapar textvy...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Detta meddelande kan inte visas.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "S_para denna bild som..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Skriv _nytt meddelande"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Lägg till adress_boken"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "Kopiera denna ad_ress"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "_Öppna med Webbläsare"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Kopiera denna _länk"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6799,7 +6814,7 @@ msgstr ""
 "\n"
 "Öppna den ändå?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Fejkad URL varning"
 
diff --git a/po/tr.po b/po/tr.po
index 360568dc..5a7d03e7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2004-12-03 11:44+0200\n"
 "Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
 "Language-Team:  <gnome-turk@gnome.org>\n"
@@ -58,162 +58,162 @@ msgstr "İleti gönderiliyor (%d / %d bayt)"
 msgid "Moving messages %s to %s ..."
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "silinen işaretler atanamıyor: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "silinemiyor\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "silinen işaretler atanamıyor: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "dizin kapatılamadı\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s kök dizini bulunamadı\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST alınırken hata oluştu.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "%s oluşturulamadı\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "%s Gelen altında oluşturulamadı\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "posta kutusu yaratılamıyor: Liste hatası\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "posta kutusu oluşturulamadı\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, 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:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "posta kutusu silinemedi\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "zarf alınamadı\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "zarf alınırken bir hata oluştu.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "zarf ayrıştırılamadı: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "alanadına erişilemedi\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "dizin seçilemedi: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 yetkilendirmesi başarısız.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 girişinde hata.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s, %s üzerine eklenemedi\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(dosya gönderiliyor...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ileti %s'ye eklenemiyor\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s, %s konumuna kopyalanamadı\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, 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:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "EXPUNGE komutu sırasında hata oluştu\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv, UTF-7 yi %s'e çeviremedi\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv %s yi UTF-7'ye çeviremedi\n"
@@ -306,20 +306,20 @@ msgstr "%s daki mesajlar %s a aktarılıyor...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "mesaj %s dan %s a kopyalanamadı\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "işaretli dosya açılamadı.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "kaynak dizini hedef dizinle aynı.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -328,7 +328,7 @@ msgstr ""
 "%s dosyası zaten bulunuyor.\n"
 "Dizin oluşturulamadı."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -598,12 +598,12 @@ msgstr "  Konu: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Veren: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "dosya modu değiştirilemedi\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "yazarken hata oluştu: %s\n"
@@ -684,7 +684,7 @@ msgstr ""
 "etkin duruma getirilebilir."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -821,7 +821,7 @@ msgstr "Eylemin kullanıcı argümanı"
 msgid "Add Address to Book"
 msgstr "Adres Defterine Ekle"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Adres"
 
@@ -834,7 +834,7 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Dosya"
@@ -857,9 +857,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Dosya/---"
@@ -881,11 +881,11 @@ msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
@@ -922,7 +922,7 @@ msgstr "/_Adres/Dü_zenle"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/A_raçlar"
@@ -931,12 +931,12 @@ msgstr "/A_raçlar"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
@@ -983,7 +983,7 @@ msgstr "/Dü_zenle/_Yapıştır"
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Adres defteri"
 
@@ -1049,7 +1049,7 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Dizini sil"
 
@@ -1206,15 +1206,15 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Not"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Hata"
 
@@ -1315,7 +1315,7 @@ msgstr "/Dü_zenle/_Geri al"
 msgid "/_Edit/_Redo"
 msgstr "/Dü_zenle/_Yenile"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Dü_zenle/---"
@@ -1328,7 +1328,7 @@ msgstr "/Dü_zenle/_Kes"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Dü_zenle/_Alıntı Yaparak Yapıştır"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Dü_zenle/_Tümünü seç"
 
@@ -1344,7 +1344,7 @@ msgstr "/Dü_zenle/Tüm _uzun satırları kaydır"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Dü_zenle/Otomatik ka_ydır"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Görünüm"
@@ -1366,9 +1366,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Görünüm/_Yanıtla/"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Görünüm/---"
 
@@ -1389,7 +1389,7 @@ msgstr "/_Görünüm/_Ek"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Görünüm/_Git/_Başka dizine git..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
@@ -1401,138 +1401,138 @@ msgstr ""
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Görünüm/_Kodlama/7 bit ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Görünüm/_Kodlama/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Görünüm/_Kodlama/Orta Avrupa (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Görünüm/_Kodlama/_Baltık (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Görünüm/_Kodlama/Baltık (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Görünüm/_Kodlama/Baltık (ISO-8859-_4)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Görünüm/_Kodlama/Yunanca (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Görünüm/_Kodlama/Türkçe (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Görünüm/_Kodlama/Kiril (ISO-8859-_5)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Görünüm/_Kodlama/Kiril (KOI8-U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Görünüm/_Kodlama/Kiril (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Görünüm/_Kodlama/Basit Çince (_GB2312)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Görünüm/_Kodlama/Tayca (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Görünüm/_Kodlama/Tayca (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/A_raçlar/_Adres defteri"
 
@@ -1540,13 +1540,13 @@ msgstr "/A_raçlar/_Adres defteri"
 msgid "/_Tools/_Template"
 msgstr "/A_raçlar/Ş_ablon"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/A_raçlar/E_ylemler"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/A_raçlar/---"
@@ -1582,71 +1582,71 @@ msgstr "%s: dosya bulunamadı\n"
 msgid "Can't get text part\n"
 msgstr "Metin bölümü alınamadı\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Alıntı formatı hatası."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Posta cevapla/ilet formatı hatası"
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "%s dosyasının boyu bulunamadı\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "%s dosyası boş."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "%s okunamadı."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - İleti düzenle (%s)"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Alıcı belirtilmedi."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 #, fuzzy
 msgid "Empty subject"
 msgstr "Konu"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Konuyu boş bıraktınız. Yine de göndermek istiyor musunuz?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "alıcı listesi alınamadı."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1654,21 +1654,21 @@ msgstr ""
 "İletinin gönderileceği hesap belirtilmedi.\n"
 "Lütfen göndermeden önce bir e-posta hesabı girin."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "İleti, %s adresine gönderilirken bir hata oluştu."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "İleti, giden kutusuna kaydedilemiyor."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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:3027
+#: src/compose.c:3035
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1679,12 +1679,12 @@ msgstr ""
 "%s / %s\n"
 "Yine de gönderilsin mi?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1693,15 +1693,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1710,85 +1710,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "eski ileti silinemedi\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "ileti kuyruğa gönderiliyor...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "kuyruk dizini bulunamadı\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "ileti kuyruğa gönderilemedi\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "İleti numarası oluşturuldu: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Düzenleme penceresi oluşturuluyor...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/A_raçlar/PGP İ_mza"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "MIME türü"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Boyut"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, 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:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1798,52 +1798,52 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -2002,12 +2002,12 @@ msgstr "Dizini düzenle"
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adıni girin:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını verin:"
 
@@ -2175,42 +2175,42 @@ msgstr "Dizini seç"
 msgid "Select folder"
 msgstr "Dizini seç"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Gelen"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Gönderilen"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kuyruk"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Çöp"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "YeniDizin"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' bir dizin adı içinde olamaz."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' dizini zaten var."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' dizini oluşturulamıyor."
@@ -2300,56 +2300,56 @@ msgstr "Dizin bilgisi ayarlanıyor...\n"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Dizin ağacını yeniden tara"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Dizin ağacı yeniden oluşturulacak. Devam edilsin mi?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Dizin ağacı yeniden yaratılıyor..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Dizin ağacı yeniden oluşturulamadı."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s dizini seçildi\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "İletiler `%s' içine indirilirken hata oluştu."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2359,26 +2359,26 @@ msgstr ""
 "(Eğer alt dizin içerecek bir dizin oluşturmak \n"
 "istiyorsanız, adının sonuna `/' karakteri getirin)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' için yeni bir isim verin:"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Dizini yeniden adlandır"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2387,12 +2387,12 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Dizini sil"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2403,21 +2403,21 @@ msgstr ""
 "`%s' altındaki tüm dizinler ve mesajlar silinecek.\n"
 "Devam etmek istediğinizden emin misiniz?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2426,34 +2426,34 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesabı silinsin mi?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesabını sil"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesabı silinsin mi?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Haber grubu hesabını sil"
 
@@ -2599,143 +2599,143 @@ msgstr "Bitir"
 msgid "Sylpheed: %d new messages"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr " Kimlik denetimi"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Yeni iletiler alınıyor"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Bekle"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "İptal edildi"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Alınıyor"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Tamamlandı (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Tamamlandı (Yeni ileti yok)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Bağlantıda hata"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Kimlik denetiminde hata"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Kilitli"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Zaman aşımı"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Tamamlandı (%d yeni mesaj)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Tamamlandı (yeni mesaj yok)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr " İletiler alınırken bazı hatalar oluştu."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "%s hesabındaki yeni iletiler alınıyor...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr " Kimlik denetimi"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Yeni iletiler alınıyor"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "POP3 sunucusuna bağlantı kuruluyor: %s ..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Kimlik denetimi yapılıyor..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Yeni ileti numaraları alınıyor (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Yeni ileti numaraları alınıyor (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Yeni ileti numaraları alınıyor (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "İletilerin boyutları alınıyor (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Çıkılıyor"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "İletiler alınıyor (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Alınıyor (%d mesaj, (%s) alındı)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Bağlantıda hata oluştu."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "İletiler işlenirken bir hata oluştu."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2744,28 +2744,28 @@ msgstr ""
 "E-posta işlenirken hata oluştu:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Yeterli disk alanı kalmadı."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Dosyaya yazılamadı."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "protokol hatası"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Bağlantı karşı taraftan kesildi."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Posta kutusu kilitli"
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2774,11 +2774,11 @@ msgstr ""
 "Posta kutusu kilitli:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Yetkilendirmede hata oluştu."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2787,15 +2787,15 @@ msgstr ""
 "Yetkilendirme başarısız:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Oturum zaman aşımına uğradı."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "İptal edildi\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "%s'den yeni mesajlar %s e alınıyor...\n"
@@ -2920,7 +2920,7 @@ msgstr "Kuyruktaki iletiler"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hala gönderilmemiş bazı iletiler kuyrukta bekliyor. Şimdi çıkılsın mı?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2929,691 +2929,692 @@ msgstr ""
 "OpenPGP desteği kapatıldı."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "Başka bir Sylpheed sistemde çalışıyor.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Eylem ayarları"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Dosya/Di_zin"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Dosya/Di_zin/Y_eni dizin oluştur..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Dosya/Di_zin/Di_zini yeniden adlandır..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Dosya/Di_zin/Di_zini yeniden adlandır..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Dosya/Di_zin/Dizini _sil"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Dosya/_Posta kutusu"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Dosya/_Posta kutusu/Posta kutusu e_kle..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Dosya/_Posta Kutusu/_Posta kutusunu kaldır"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_Dosya/_Posta Kutusu/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Dosya/_Posta Kutusu/Yeni mesajlar için k_ontrol et"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr ""
 "/_Dosya/_Posta Kutusu/_Tüm posta kutuları için yeni mesajları kontrol et"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/_Dosya/_Posta Kutusu/Dizin ağacını _yeniden oluştur"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Dosya/Posta k_utusu dosyasını aktar..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Dosya/_Posta kutusu dosyasına gönder..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Dosya/Tüm çö_pü boşalt"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Dosya/_Farklı kaydet..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Dosya/_Farklı kaydet..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Dosya/_Yazdır..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/_Dosya/Çevrimdı_şı çalış"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Dosya/Çı_k"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/Dü_zenle/_Sıralı seç"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/Dü_zenle/Gü_ncel iletide bul..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/Dü_zenle/_İletilerde ara..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Görünüm/Göster veya _gizle"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Görünüm/Göster veya _gizle/_Dizin ağacı"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 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:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 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:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Simge"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Simge"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Görünüm/Göster veya _gizle/_Araç çubuğu/_Metin"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 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:578
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Görünüm/Göster veya _gizle/_Durum çubuğu"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Görünüm/Göster veya _gizle/_Durum çubuğu"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Görünüm/_Git/_Başka dizine git..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Görünüm/D_izin ağacını ayır"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 #, fuzzy
 msgid "/_View/Separate _message view"
 msgstr "/_Görünüm/Ayrı _ileti görünümü"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Görünüm/Sıra_la"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Görünüm/Sıra_la/_Numaraya göre"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Görünüm/Sıra_la/_Boyuta göre"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Görünüm/Sıra_la/_Tarihe göre"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/_Görünüm/Sıra_la/_Tarihe göre"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Görünüm/Sıra_la/_Gönderene göre"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Görünüm/Sıra_la/_Alıcıya göre"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Görünüm/Sıra_la/_Konuya göre"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Görünüm/Sıra_la/_Renge göre"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Görünüm/Sıra_la/İş_arete göre"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Görünüm/Sıra_la/_Okunmamışa göre"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Görünüm/Sıra_la/E_klentiye göre"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Görünüm/Sıra_la/_Sıralama yapma"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Görünüm/Sıra_la/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Görünüm/Sıra_la/Artan sırala"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Görünüm/Sıra_la/Azalan sırala"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Görünüm/Sıra_la/Konuya _göre izle"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Görünüm/_Konum görünümü"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Görünüm/Tüm _başlıkları genişlet"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Görünüm/Tüm _başlıkları küçült"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Görünüm/_Görüntü öğesini seç..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Görünüm/_Git"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Görünüm/_Git/Önceki _ileti"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Görünüm/_Git/Sonraki _ileti"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Görünüm/_Git/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Görünüm/_Git/Ö_nceki okunmamış ileti"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Görünüm/_Git/_Sonraki okunmamış ileti"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Görünüm/_Git/Ö_nceki yeni ileti"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Görünüm/_Git/Sonraki _yeni ileti"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Görünüm/_Git/Önceki _işaretli ileti"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Görünüm/_Git/S_onraki işaretli ileti"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Görünüm/_Git/Ö_nceki _etiketli ileti"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Görünüm/_Git/Son_raki etiketli ileti"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Görünüm/_Git/_Başka dizine git..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 #, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Görünüm/_Kodlama/_Otomatik tanı"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Görünüm/_Kodlama/Batı Avrupa (ISO-8859-_15)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Görünüm/_Kodlama/Japonca (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Görünüm/_Kodlama/Japonca (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Görünüm/_Kodlama/Japonca (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Görünüm/_Kodlama/Geleneksel Çince (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 #, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Görünüm/_Kodlama/Çince (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Görünüm/Yeni _pencerede aç"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Görünüm/İ_leti kaynağı"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Görünüm/Tüm _başlıklar"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Görünüm/_Görünümü güncelle"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/İ_leti"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/İ_leti/_Al"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/İ_leti/_Al/Ge_çerli hesaptan al"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/İ_leti/_Al/T_üm hesaplardan al"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/İ_leti/_Al/İ_ptal Et"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/İ_leti/_Al/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/İ_leti/_Kuyruktaki iletileri gönder"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/İ_leti/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/İ_leti/Yeni _ileti gönder"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/İ_leti/Yanıtl_a"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/İ_leti/B_aşkasına yanıtla"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/İ_leti/B_aşkasına yanıtla/_herkese"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/İ_leti/B_aşkasına yanıtla/_gönderene"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/İ_leti/B_aşkasına yanıtla/eposta l_istesine"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/İ_leti/E_k olarak yönlendir"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/İ_leti/Yö_nlendir"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/İ_leti/Taşı..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/İ_leti/_Kopyala..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/İ_leti/İş_aretle"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/İ_leti/İş_aretle/İş_aretle"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/İ_leti/İş_aretle/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/İ_leti/İş_aretle/O_kunmamış olarak işaretle"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/İ_leti/İş_aretle/Ok_unmuş olarak işaretle"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/İ_leti/İş_aretle/Ok_unmuş olarak işaretle"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/İ_leti/İş_aretle/Hepsini _okunmuş olarak işaretle"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/İ_leti/_Sil"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/İ_leti/İş_aretle/İşareti _kaldır"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr ""
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/İ_leti/Ye_niden düzenle"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/A_raçlar/Göndereni adres defterine ekle"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm iletileri filtrele"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/A_raçlar/S_eçilen tüm mesajları filtrele"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/A_raçlar/Filtre _kuralı oluştur"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Otomatik oluştur"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Gönderene göre oluştur"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Alıcıya göre oluştur"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Konuya göre oluştur"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/A_raçlar/_Dizin içindeki tüm iletileri filtrele"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/A_raçlar/S_eçilen tüm mesajları filtrele"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/A_raçlar/Ç_ift iletileri sil"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "İşaretli süreçleri çalıştır"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/A_raçlar/_Kayıt penceresi"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/_Yapılandırma"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Yapılandırma/_Genel tercihler..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/_Yapılandırma/F_iltre ayarları..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/_Yapılandırma/Ş_ablon..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/_Yapılandırma/_Eylemler..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/_Yapılandırma/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Yapılandırma/_Güncel hesap tercihleri..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Yapılandırma/Y_eni hesap oluştur..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Yapılandırma/Hesapları _düzenle..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Yapılandırma/_Güncel hesabı değiştir"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/Yardı_m/_Kılavuz"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/Yardı_m/_Kılavuz/İ_ngilizce"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Yardı_m/_Kılavuz/_Japonca"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/Yardı_m/_SSS"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/Yardı_m/_SSS/İ_ngilizce"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/Yardı_m/_SSS/_Almanca"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Yardı_m/_SSS/İ_spanyolca"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/Yardı_m/_SSS/_Fransızca"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Yardı_m/_SSS/İ_talyanca"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "Komut satırı belirtilmedi."
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/Yardı_m/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Yeni pencere oluşturuluyor...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, 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:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "bitti.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Başlıksız"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "hiçbiri"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Pencere ayırma tarzı %d den %d e çevriliyor\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Çevrimdışısınız. Çevrimiçi olunsun mu?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Tüm çöpü boşalt"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Posta kutusu ekle"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3624,16 +3625,16 @@ msgstr ""
 "Eğer varolan potsa kutusu verilirse, otomatik\n"
 "olarak taranacaktır."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3642,69 +3643,69 @@ msgstr ""
 "Posta kutusu oluşturulurken hata oluştu.\n"
 "Bazı dosyalar bulunuyor olabilir veya yeterli izine sahip olmayabilirsiniz."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylheed - Dizin Görünümü"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Her_kese yanıtla"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/_Gönderene yanıtla"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 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:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "Çevrimiçisiniz. Çevrimdışı olmak için simgeye tıklayın."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Çık"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Programdan çıkılsın mı?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 #, fuzzy
 msgid "Command line options"
 msgstr "Komut satırı belirtilmedi."
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kullanım: %s [SEÇENEKLER] ...\n"
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3720,7 +3721,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3943,7 +3944,7 @@ msgstr "Hesap%d"
 msgid "Preferences for new account"
 msgstr "Yeni hesap için tercihler"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Hesap tercihleri"
 
@@ -3956,7 +3957,7 @@ msgid "Receive"
 msgstr "Al"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Gönder"
 
@@ -4178,7 +4179,7 @@ msgstr "Göndermeden önce POP3 ile kimlik denetimi yap"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "İmza"
 
@@ -4645,7 +4646,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Düzenleyici"
 
@@ -5783,7 +5784,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Cevaplarken başlığın başındaki [...] veya (...) işaretlerini sil"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hesap"
 
@@ -5998,81 +5999,91 @@ msgstr "Yazdır"
 msgid "Print message"
 msgstr "İletiyi gönder"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Adım"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "İletilerin alınacağı sunucu"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Çalıştır"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "İşaretli süreçleri çalıştır"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Tercihler"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Ortak tercihler"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "İletiyi gönder"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Sonra gönder"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "İletiyi kuyruğa aktar ve sonra gönder"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Taslak"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "İçer"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Dosya içer"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Ekle"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Dosya ekle"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 #, fuzzy
 msgid "Append signature"
 msgstr "KÖTÜ imza"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Harici bir düzenleyici kullan"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Satır kaydır"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Tüm uzun satırları kaydır"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Görünüm/_Git/_Başka dizine git..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6327,7 +6338,7 @@ msgstr "İmza bulunamadı"
 msgid "Good signature from \"%s\""
 msgstr "\"%s\"'ten iyi imza"
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "İyi imza"
 
@@ -6336,7 +6347,7 @@ msgstr "İyi imza"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr ""
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr ""
 
@@ -6373,7 +6384,7 @@ msgstr ""
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" ten hatalı imza"
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "KÖTÜ imza"
 
@@ -6832,46 +6843,50 @@ msgstr "%s dosyası zaten var\n"
 msgid "Creating text view...\n"
 msgstr "Metin görünüm oluşturuluyor...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Bu mesaj görüntülenemiyor.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Farklı kaydet..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Yeni ileti düzenle"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Göndericiyi adres defterine ekle"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Ortak adres"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Tarayıcı"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6883,7 +6898,7 @@ msgstr ""
 "görünenden (%s) farklı.\n"
 "Yine de açılsın mı?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 2143ec4b..37cf3910 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2007-01-05 13:58+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -57,161 +57,161 @@ msgstr "Приєднуємо листи до %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "Переносимо листи %s в %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копіюємо листи %s в %s ..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Видаляємо листи від %s"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не вдалось встановити прапорець видалення: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "не вдалось очистити папку від видалених листів\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Видаляємо всі листи у %s"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не вдалось встановити прапорець видалення: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "не вдалось закрити папку\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "коренева папка %s не існує\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "помилка при отриманні LIST'а.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Не вдалось створити '%s'\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Не вдалось створити '%s' всередині INBOX\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не вдалось створити скриньку: невдача LIST\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "не вдалось створити скриньку\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не вдалось перейменувати скриньку: %s на %s\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "не вдалось видалити скриньку\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "не вдалось отримати конверт\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Отримуємо заголовки листів (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "трапилась помилка при отриманні конверта.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "не вдалось розібрати конверт: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не вдалось встановити сесію IMAP4 з: %s:%d\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "не вдалось отримати простір імен\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не вдалось отримати папку: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "помилка при виконанні команди imap: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не вдалось додати %s до %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(посилаємо файл...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не вдалось приєднати лист до %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не вдалось скопіювати %s в %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "помилка при виконанні команди imap:  STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "помилка при виконанні команди imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "помилка при виконанні команди imap: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може конвертувати UTF-7 в %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може конвертувати %s в UTF-7\n"
@@ -303,20 +303,20 @@ msgstr "Експортуємо листи з %s в %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "не вдалось копіювати %s в %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Не вдалось відкрити файл позначок.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "папка призначення ідентична до вихідної.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Копіюємо лист %s%c%d в %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -325,7 +325,7 @@ msgstr ""
 "Файл `%s' вже існує.\n"
 "Неможливо створити папку."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -602,12 +602,12 @@ msgstr "  Суб'єкт:  %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Видав: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "не вдалось змінити права доступу файла\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "Невдача запису в %s.\n"
@@ -690,7 +690,7 @@ msgstr ""
 "account'и, які поповнюються через `Отримати всі'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -825,7 +825,7 @@ msgstr "Аргумент користувача"
 msgid "Add Address to Book"
 msgstr "Додати адресу до книги"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Адреса"
 
@@ -838,7 +838,7 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
@@ -860,9 +860,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новий сервер LDAP"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/Файл/---"
@@ -884,11 +884,11 @@ msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Редагувати"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
@@ -925,7 +925,7 @@ msgstr "/Адреса/Редагувати"
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Інструменти"
@@ -934,12 +934,12 @@ msgstr "/Інструменти"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
@@ -986,7 +986,7 @@ msgstr "/Редагувати/Вставити"
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -1051,7 +1051,7 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Видалити папку"
 
@@ -1202,15 +1202,15 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Примітка"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Попередження"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Помилка"
 
@@ -1310,7 +1310,7 @@ msgstr "/Редагувати/Undo"
 msgid "/_Edit/_Redo"
 msgstr "/Редагувати/Redo"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/Редагувати/---"
@@ -1323,7 +1323,7 @@ msgstr "/Редагувати/Вирізати"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Редагувати/Вставити як цитату"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/Редагувати/Виділити все"
 
@@ -1339,7 +1339,7 @@ msgstr "/Редагувати/Згорнути всі довгі рядки"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Редагувати/Автозгортання"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/Вигляд"
@@ -1361,9 +1361,9 @@ msgid "/_View/_Reply to"
 msgstr "/Вигляд/Зворотня адреса"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/Вигляд/---"
 
@@ -1384,7 +1384,7 @@ msgstr "/Вигляд/Вкладення"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/Вигляд/Перейти до/Іншої папки"
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/Вигляд/Кодова таблиця"
 
@@ -1395,112 +1395,112 @@ msgstr "/Вигляд/Кодова таблиця/_Aвтоматична"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/Вигляд/Кодова таблиця/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/Вигляд/Кодова таблиця/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Вигляд/Кодова таблиця/Unicode (UT_F-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-1_3)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/Вигляд/Кодова таблиця/Балтійська (Windows-1257)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/Вигляд/Кодова таблиця/Грецька (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/Вигляд/Кодова таблиця/Арабська (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/Вигляд/Кодова таблиця/Арабська (Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/Вигляд/Кодова таблиця/Єврейська (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/Вигляд/Кодова таблиця/Єврейська (_Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/Вигляд/Кодова таблиця/Турецька (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (KOI8-_U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/Вигляд/Кодова таблиця/Кирилиця (_Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/Вигляд/Кодова таблиця/Спрощена китайська (_GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/Вигляд/Кодова таблиця/Тайська (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/Інструменти/Адресна книга"
 
@@ -1508,13 +1508,13 @@ msgstr "/Інструменти/Адресна книга"
 msgid "/_Tools/_Template"
 msgstr "/Інструменти/Шаблон"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/Інструменти/Дії"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/Інструменти/---"
@@ -1548,70 +1548,70 @@ msgstr "%s: файл не існує\n"
 msgid "Can't get text part\n"
 msgstr "Не вдалось отримати текстову частину\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Помилка у форматі цитування."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Помилка у форматі message reply/forward."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Файл %s не існує\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Не вдалось отримати розмір %s\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "Файл %s порожній."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Не вдалось прочитати %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Лист: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Створити лист%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Не вказано отримувача."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Порожня тема"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Поле Subject порожнє. Все ж послати?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "не вдалось отримати список отримувачів."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1619,21 +1619,21 @@ msgstr ""
 "Обліковий запис для відсилання пошти не вказано.\n"
 "Оберіть, будь-ласка, запис перед відправкою."
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Трапилась помилка при відсиланні листа до %s ."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Не вдалось зберегти лист в outbox."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не вдалось знайти ключа, відповідного обраному ідентифікатору `%s'."
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1644,11 +1644,11 @@ msgstr ""
 "%s на %s.\n"
 "Все ж послати як %s?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Помилка при перетворенні кодування"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1661,15 +1661,15 @@ msgstr ""
 "\n"
 "Все ж відіслати?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Максимальна довжина рядка"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr "Шифрувати з прихованими адресатами"
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1683,83 +1683,83 @@ msgstr ""
 "\n"
 "Все ж послати?"
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "не вдалось видалити старий лист\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "лист в чергу...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "не вдалось знайти папку черги\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "не вдалось поставити лист в чергу\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "генерований Message-ID: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Відкриваємо вікно створення листа...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "тип MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Розмір"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1768,48 +1768,48 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -1966,12 +1966,12 @@ msgstr "Редагувати папку"
 msgid "Input the new name of folder:"
 msgstr "Введіть нову назву папки:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Введіть назву нової папки:"
 
@@ -2138,42 +2138,42 @@ msgstr "Обрати папку"
 msgid "Select folder"
 msgstr "Обрати папку"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Відіслані"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Черга"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Кошик"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Чернетки"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може міститись в назві папки."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка `%s' вже існує."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не вдалось створити папку `%s'."
@@ -2260,56 +2260,56 @@ msgstr "Встановлюємо інформацію папки...\n"
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Перебудувати дерево папок"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок буде перебудовано. Продовжити?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Перебудовуємо дерево папок..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Не вдалось перебудувати дерево папок."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Перевірити за новими листами у всіх папках..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Мотлох"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папку %s обрано\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Завантажуємо листи у %s ..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Трапилась помилка при завантаженні листів у `%s'."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2319,26 +2319,26 @@ msgstr ""
 "(якщо бажаєте створити папку, яка містить підпапки,\n"
 " додайте `/' в кінці назви)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введіть нову назву для `%s':"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Перейменувати папку"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Не вдалось перейменувати папку `%s'."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не вдалось перенести папку `%s'."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2347,11 +2347,11 @@ msgstr ""
 "Справді видалити папку пошуку `%s' ?\n"
 "(Листи НЕ видаляються з диска.)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Видалити папку пошуку"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2364,20 +2364,20 @@ msgstr ""
 "\n"
 "Справді бажаєте видалити?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Не вдалось видалити папку `%s'."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Спорожнити кошик"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2386,34 +2386,34 @@ msgstr ""
 "Справді видалити скриньку `%s' ?\n"
 "(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Видалити скриньку"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Справді видалити обліковий запис IMAP4 `%s'?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Видалити обліковий запис IMAP4"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Дійсно видалити конференцію `%s'?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Видалити конференцію"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Дійсно видалити обліковий запис конференції `%s'?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Видалити обліковий запис конференції"
 
@@ -2559,142 +2559,142 @@ msgstr "Закінчити"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d нових листів"
 
-#: src/inc.c:478
+#: src/inc.c:481
 msgid "Authenticating with POP3"
 msgstr "Аутентифікація з POP3"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Отримання нових листів"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Очікування"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Скасовано"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Отримання"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Виконано (%d лист(ів) (%s) отримано)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Виконано (немає нових листів)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Невдача з'єднання"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Невдача автентифікації"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Заблоковано"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Закінчено (%d нових листів)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Закінчено (немає нових листів)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "При отриманні пошти трапились деякі помилки."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "отримання нової пошти для запису %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s: Аутентифікація з POP3"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Отримання нових листів"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "З'єднуємось з сервером POP3: %s ..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером POP3: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Автентифікація..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Отримуємо листи від %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Отримуємо кількість нових листів (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Отримуємо кількість нових листів (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Отримуємо кількість нових листів (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Отримуємо розмір листів (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Видаляємо лист %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Виходимо"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Отримуємо лист (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Отримуємо лист (%d лист(ів) (%s) отримано)"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Невдача з'єднання."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2703,28 +2703,28 @@ msgstr ""
 "При обробці пошти трапилась помилка:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Немає вільного місця на диску."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Не вдалось писати в файл."
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Помилка сокета."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "З'єднання закрито віддаленим хостом."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Скриньку заблоковано."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2733,11 +2733,11 @@ msgstr ""
 "Скриньку заблоковано:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Невдача аутентифікації."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2746,15 +2746,15 @@ msgstr ""
 "Невдача аутентифікації:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Таймаут сесії."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Включення скасовано\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Отримуємо нові листи від %s в %s...\n"
@@ -2884,7 +2884,7 @@ msgstr "Листи в черзі"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Деякі невідіслані листи - в черзі. Вийти зараз?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2893,15 +2893,15 @@ msgstr ""
 "Відключено підтримку OpenPGP."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "вже запущено інший Sylpheed.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Перенесення налаштувань"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2909,654 +2909,655 @@ msgstr ""
 "Знайдено налаштування для попередньої\n"
 "версії. Перенести їх у нову версію?"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/Файл/Папка"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Файл/Папка/Створити нову..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Файл/Папка/Перейменувати..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/Файл/Папка/Перенести..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Файл/Папка/Видалити папку"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/Файл/Скринька"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/Файл/Скринька/Додати скриньку..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/Файл/Скринька/Видалити скриньку"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/Файл/Скринька/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/Файл/Скринька/Перевірити за новими листами"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/Файл/Скринька/Перевірити за новими листами у всіх скриньках"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/Файл/Скринька/Перебудувати дерево папок"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/Файл/Імпортувати файл mbox"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/Файл/Експортувати в файл mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/Файл/Спорожнити весь кошик"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/Файл/Зберегти як..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 msgid "/_File/Page set_up..."
 msgstr "/Файл/Налаштування сторінки..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/Файл/Друкувати..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/Файл/Працювати без з'єднання"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/Файл/Вийти"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/Редагувати/Виділити обговорення"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/Редагувати/Шукати в поточному листі"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/Редагувати/Пошук листів..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/Вигляд/Показати чи приховати"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/Вигляд/Показати чи приховати/Дерево папок"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/Вигляд/Показати чи приховати/Зміст листа"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка і текст"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Іконка"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Текст"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/Вигляд/Показати чи приховати/Панель інструментів/Немає"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/Вигляд/Показати чи приховати/Панель пошуку"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/Вигляд/Показати чи приховати/Панель стану"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/Вигляд/Перейти до/Іншої папки"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/Вигляд/Окреме дерево папок"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/Вигляд/Окрема область перегляду змісту"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/Вигляд/Сортувати"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/Вигляд/Сортувати/За номером"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/Вигляд/Сортувати/За розміром"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/Вигляд/Сортувати/За датою"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/Вигляд/Сортувати/За датою нитки обговорення"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/Вигляд/Сортувати/За відправником"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/Вигляд/Сортувати/За одержувачем"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/Вигляд/Сортувати/За темою"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/Вигляд/Сортувати/За виділенням кольором"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/Вигляд/Сортувати/За позначкою"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/Вигляд/Сортувати/Окремо непрочитані"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/Вигляд/Сортувати/За вкладенням"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/Вигляд/Сортувати/Непотрібно"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/Вигляд/Сортувати/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/Вигляд/Сортувати/За зростанням"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/Вигляд/Сортувати/За спаданням"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/Вигляд/Сортувати/Групувати за темою"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/Вигляд/Перегляд обговорення"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/Вигляд/Розгортати всі обговорення"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/Вигляд/Згорнути всі обговорення"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/Вигляд/Встановити поля для показу..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/Вигляд/Перейти до"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/Вигляд/Перейти до/Наступного листа"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/Вигляд/Перейти до/Попереднього листа"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/Вигляд/Перейти до/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/Вигляд/Перейти до/Попереднього непрочитаного листа"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/Вигляд/Перейти до/Наступного непрочитаного листа"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/Вигляд/Перейти до/Попереднього нового листа"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/Вигляд/Перейти до/Наступного нового листа"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/Вигляд/Перейти до/Попереднього позначеного листа"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/Вигляд/Перейти до/Наступного позначеного листа"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/Вигляд/Перейти до/Попереднього листа, виділеного кольором"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/Вигляд/Перейти до/Наступного листа, виділеного кольором"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/Вигляд/Перейти до/Іншої папки"
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/Вигляд/Кодова таблиця/_Aвтовизначення"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/Вигляд/Кодова таблиця/Західноєвропейська (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/Вигляд/Кодова таблиця/Японська (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/Вигляд/Кодова таблиця/Японська (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/Вигляд/Кодова таблиця/Японська (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/Вигляд/Кодова таблиця/Традиційна китайська (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/Вигляд/Кодова таблиця/Китайська (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/Вигляд/Відкрити в новому вікні"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/Вигляд/Вихідний текст листа"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 msgid "/_View/All _headers"
 msgstr "/Вигляд/Весь заголовок"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/Вигляд/Оновити список"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/Лист"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/Лист/Отримати"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/Лист/Отримати/Для поточного запису"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/Лист/Отримати/Для всіх записів"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/Лист/Отримати/Скасувати отримання"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/Лист/Отримати/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/Лист/Відіслати відкладені листи"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/Лист/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/Лист/Написати новий лист"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/Лист/Відповісти"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Лист/Відповісти/всім"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Лист/Відповісти/відправнику"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Лист/Відповісти/конференції"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/Лист/Переслати"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/Лист/Переслати як вкладення"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/Лист/Переспрямувати"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/Лист/Перемістити"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/Лист/Копіювати"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/Лист/Позначка"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Лист/Позначка/Зробити"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Лист/Позначка/Зняти"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/Лист/Позначка/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Лист/Позначка/Позначити як непрочитаний"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Лист/Позначка/Позначити як прочитаний"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/Лист/Позначка/Позначити нитку як прочитану"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Лист/Позначка/Позначити всі як прочитані"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/Лист/Видалити"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/Лист/Вважати мотлохом"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/Лист/Не вважати мотлохом"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/Лист/Змінити"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/Інструменти/Додати відправника до адресної книги"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/Інструменти/Фільтрувати всі листи в папці"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/Інструменти/Фільтрувати виділені листи"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/Інструменти/Створити правило фільтрування"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/Інструменти/Створити правило фільтрування/Автоматично"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Від'"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Кому'"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/Інструменти/Створити правило фільтрування/За полем `Тема'"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/Інструменти/Фільтрувати мотлох в папці"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/Інструменти/Фільтрувати мотлох у виділених листах"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/Інструменти/Видалити повторювані листи"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Виконати позначений процес"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/Інструменти/Вікно журналу"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/Конфігурація"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Конфігурація/Спільні налаштування..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Конфігурація/Налаштування фільтра..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/Конфігурація/Шаблон..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/Конфігурація/Дії..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/Конфігурація/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Конфігурація/Налаштування поточного запису..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/Конфігурація/Створити новий обліковий запис..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Конфігурація/Редагувати облікові записи..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/Конфігурація/Змінити поточний запис"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/Довідка/Посібник"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/Довідка/Посібник/Англійський"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/Довідка/Посібник/Японський"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/Довідка/FAQ"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/Довідка/FAQ/Англійський"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/Довідка/FAQ/Німецький"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/Довідка/FAQ/Іспанський"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/Довідка/FAQ/Французький"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/Довідка/FAQ/Італійський"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/Довідка/Опції командного рядка"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/Довідка/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Створюємо головне вікно...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "виконано.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "БезНазви"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "немає"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Зміна типу розділення вікна з %d на %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Без з'єднання"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "З'єднання немає. Під'єднатись?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Спорожнити весь кошик"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Видалити всі листи з усіх папок кошика?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Додати скриньку"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3566,16 +3567,16 @@ msgstr ""
 "Якщо вона вже існує, її буде перечитано\n"
 "автоматично."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька `%s' вже існує."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3585,67 +3586,67 @@ msgstr ""
 "Можливо, деякі файли вже існують, або Ви не маєте\n"
 "права запису тут."
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Папки"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Листи"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/Відповісти"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Відповісти всім"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Відповісти відправникові"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти конференції"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/Переслати далі"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Переслати далі як вкладення"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Переспрямувати"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr "З'єднання немає. Клацніть на іконці, щоб під'єднатись."
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "Ви під'єднані. Клацніть на іконці, щоб від'єднатись."
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Вихід"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Вийти з цієї програми?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Опції командного рядка"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Вживання: sylpheed [ОПЦІЇ]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3673,7 +3674,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3906,7 +3907,7 @@ msgstr "Запис%d"
 msgid "Preferences for new account"
 msgstr "Налаштування для нового запису"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Налаштування запису"
 
@@ -3919,7 +3920,7 @@ msgid "Receive"
 msgstr "Отримання"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Послати"
 
@@ -4132,7 +4133,7 @@ msgstr "Аутентифікація POP3 перед відсиланням"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Підпис"
 
@@ -4592,7 +4593,7 @@ msgstr "Успадковувати отримувачів при відпові�
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Редактор"
 
@@ -5686,7 +5687,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Видаляти [...] чи (...) на початку теми при відповіді"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Обліковий запис"
 
@@ -5899,80 +5900,90 @@ msgstr "Друк"
 msgid "Print message"
 msgstr "Послати лист"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Крок"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Сервер для отримання"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Виконати"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Виконати позначений процес"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "Налаштування"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Спільні налаштування"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Послати лист"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Послати пізніше"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Покласти в папку черги і послати пізніше"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Чернетка"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Зберегти в папці чернеток"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Вставити"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Вставити файл"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Приєднати"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Приєднати файл"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Приєднати підпис"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Редагувати зовнішнім редактором"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Згортання рядків"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Згорнути всі довгі рядки"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/Вигляд/Перейти до/Іншої папки"
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6224,7 +6235,7 @@ msgstr "Підпису не знайдено"
 msgid "Good signature from \"%s\""
 msgstr "Гарний підпис від \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Гарний підпис"
 
@@ -6233,7 +6244,7 @@ msgstr "Гарний підпис"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Належний підпис, але ключ для  \"%s\"  не перевірений"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Належний підпис (неперевірений ключ)"
 
@@ -6269,7 +6280,7 @@ msgstr "Належний підпис, але ключ відкликано"
 msgid "BAD signature from \"%s\""
 msgstr "ПОГАНИЙ підпис від \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "ПОГАНИЙ підпис"
 
@@ -6722,42 +6733,46 @@ msgstr "файл %s вже існує\n"
 msgid "Creating text view...\n"
 msgstr "Створюємо область перегляду тексту...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Цей лист неможливо відобразити.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 "Неможливо показати тіло листа через невдачу запису у тимчасовий файл.\n"
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "Зберегти зображення як..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Створити новий лист"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Додати до адресної книги"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "Копіювати цю адресу"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "Відкрити Web-браузером"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Скопіювати посилання"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6770,7 +6785,7 @@ msgstr ""
 "\n"
 "Все ж відкрити?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Попередження: підміна URL"
 
diff --git a/po/vi.po b/po/vi.po
index 289ddfd5..58216f08 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+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"
@@ -52,161 +52,161 @@ msgstr "Đang ghép thư vào %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "Đang chuyển thư %s tới %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Đang chép thư %s tới %s ..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "Đang xoá thư %s"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "không thể đặt cờ đã xoá: %s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "không thể xoá\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Xoá mọi thư trong %s"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "không thể đặt cờ đã xoá: 1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "không thể đóng thư mục\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "thư mục gốc %s không tồn tại\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "xảy ra lỗi khi lấy LIST.\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Không thể tạo '%s'\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Không thể tạo '%s' ở INBOX\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "không thể tạo hộp thư: LIST thất bại\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "không thể tạo hộp thư\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, 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:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "không thể xoá hộp thư\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "không thể lấy phong bì\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Đang lấy header của thư (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "xảy ra lỗi khi lấy phong bì.\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "không thể phân tích phong bì: %s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, 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:2544
+#: libsylph/imap.c:2539
 #, 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:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "không thể lấy khoảng định danh (namespace)\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "không thể chọn thư mục: %s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "có lỗi khi chạy lệnh imap: STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "Xác thực IMAP4 thất bại:\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "Đăng nhập IMAP4 thất bại.\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "không thể ghep %s vào %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(đang gửi tập tin...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "không thể ghép thư vào %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "không thể chép %s tới %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, 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:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "có lỗi khi chạy lệnh imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "có lỗi khi chạy lệnh imap: CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, 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:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv không thể chuyển %s sang UTF-7\n"
@@ -296,20 +296,20 @@ msgstr "Xuất thư từ %s sang %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "không thể chép thư %s tới %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "Không thể mở tập tin đánh đấu.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "thư mục nguồn cũng chính là thư mục gốc.\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "Đang chép thư %s%c%d tới %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -318,7 +318,7 @@ msgstr ""
 "Tập tin `%s' đã có trước.\n"
 "Không thể tạo thư mục."
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -594,12 +594,12 @@ msgstr "  Tiêu đề: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Người phát hành: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "không thể đổi chế độ tập tin\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "thất bại khi ghi vào %s.\n"
@@ -668,7 +668,7 @@ msgstr ""
 "trên cột `G' để cho phép lấy thư về bằng `Lấy tất cả'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -803,7 +803,7 @@ 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:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "Địa chỉ"
 
@@ -816,7 +816,7 @@ msgstr "Ghi chú"
 msgid "Select Address Book Folder"
 msgstr "Chọn thư mục sổ địa chỉ"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Tập tin"
@@ -838,9 +838,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/_Tập tin/_Máy chủ LDAP mới"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/_Tập tin/---"
@@ -862,11 +862,11 @@ msgid "/_File/_Close"
 msgstr "/_Tập tin/Đón_g"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Soạn"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Soạn/_Sao chép"
@@ -903,7 +903,7 @@ msgstr "/Đị_a chỉ/_Soạn"
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Công cụ"
@@ -912,12 +912,12 @@ msgstr "/_Công cụ"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hỗ trợ/_Giới thiệu"
@@ -964,7 +964,7 @@ msgstr "/_Soạn/_Dán"
 msgid "E-Mail address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
@@ -1029,7 +1029,7 @@ msgstr ""
 "Bạn có muốn xoá thư mục VÀ mọi địa chỉ trong `%s' ?\n"
 "Nếu chỉ xoá thư mục, các địa chỉ sẽ được chuyển đến thư mục cấp cao hơn."
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
@@ -1184,15 +1184,15 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "Chú ý"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "Lỗi"
 
@@ -1292,7 +1292,7 @@ msgstr "/_Soạn/_Hoàn tác"
 msgid "/_Edit/_Redo"
 msgstr "/_Soạn/Ch_uyển tác"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/_Soạn/---"
@@ -1305,7 +1305,7 @@ msgstr "/_Soạn/_Cắt"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Soạn/Dán ở dạng t_rích dẫn"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/_Soạn/Chọ_n tất cả"
 
@@ -1321,7 +1321,7 @@ msgstr "/_Soạn/Khuôn _mọi dòng dài"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Soạn/Tự độ_ng khuôn dòng"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/_Xem"
@@ -1343,9 +1343,9 @@ msgid "/_View/_Reply to"
 msgstr "/_Xem/_Hồi âm cho"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/_Xem/---"
 
@@ -1366,7 +1366,7 @@ msgstr "/_Xem/Đí_nh kèm"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/_Xem/Mã _kí tự"
 
@@ -1377,113 +1377,113 @@ msgstr "/_Xem/Mã _kí tự/_Tự động"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/_Xem/Mã _kí tự/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Xem/Mã _kí tự/7bit ascii (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Xem/Mã _kí tự/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Xem/Mã _kí tự/Tây Âu (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Xem/Mã _kí tự/Tây Âu (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Xem/Mã _kí tự/Trung Âu (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Xem/Mã _kí tự/_Baltic (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Xem/Mã _kí tự/Baltic (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/_Xem/Mã _kí tự/A-rập (Windows-1256)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Xem/Mã _kí tự/Hi Lạp (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Xem/Mã _kí tự/A-rập (ISO-8859-_6)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Xem/Mã _kí tự/A-rập (Windows-1256)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Xem/Mã _kí tự/Do Thái (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Xem/Mã _kí tự/Do Thái (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Xem/Mã _kí tự/Thổ Nhĩ Kì (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (KOI8-U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Xem/Mã _kí tự/Cyrillic (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Xem/Mã _kí tự/Hán giản thể (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Xem/Mã _kí tự/Triều Tiên (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Xem/Mã _kí tự/Thái (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Xem/Mã _kí tự/Thái (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/_Công cụ/_Sổ địa chỉ"
 
@@ -1491,13 +1491,13 @@ msgstr "/_Công cụ/_Sổ địa chỉ"
 msgid "/_Tools/_Template"
 msgstr "/_Công cụ/_Mẫu"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/_Công cụ/_Hành động"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/_Công cụ/---"
@@ -1531,70 +1531,70 @@ msgstr "%s: tập tin không tồn tại\n"
 msgid "Can't get text part\n"
 msgstr "Không thể lấy phần văn bản\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "Lỗi định dạng đánh dấu trích dẫn."
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "Lỗi định dạng trả lời/chuyển tiếp thư."
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, 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:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "%s là tập tin trống."
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "Không thể đọc %s."
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "Thư: %s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 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:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Viết thư%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "Chưa chỉ định người nhận."
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "Tiêu đề bị bỏ trống"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "Tiêu đề bị bỏ trống. Vẫn gửi đi?"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "không lấy được danh sách người nhận."
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1602,21 +1602,21 @@ 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:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Xảy ra lỗi khi gửi thư đến %s ."
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "Không thể lưu thư vào hộp gửi (outbox)."
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, 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:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1627,11 +1627,11 @@ msgstr ""
 "\n"
 "Vẫn gửi ở dạng %s?"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "Lỗi chuyển mã"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1644,15 +1644,15 @@ msgstr ""
 "\n"
 "Vẫn gửi đi?"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "Giới hạn độ dài của dòng"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1661,83 +1661,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "không thể xoá thư cũ\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "đang xếp hàng thư...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "không thấy thư mục đợi\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "không thể xếp hàng thư\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "đã tạo ID của thư: %s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "Đang tạo cửa sổ soạn thảo...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "Chữ kí PGP"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 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:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, 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:5724
+#: src/compose.c:5732
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1746,48 +1746,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:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 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:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, 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:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -1944,12 +1944,12 @@ msgstr "Sửa thư mục"
 msgid "Input the new name of folder:"
 msgstr "Đặt tên mới cho thư mục:"
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "Thư mục mới"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "Đặt tên cho thư mục mới:"
 
@@ -2116,42 +2116,42 @@ msgstr "Chọn thư mục"
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Hộp nhận"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Đã gửi"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Đợi gửi"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Thùng rác"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Nháp"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "Thư mục mới"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' không được có trong tên thư mục."
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Thư mục `%s' đã có trước."
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Không tạo được thư mục `%s'."
@@ -2239,56 +2239,56 @@ 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:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Đang quét thư mục %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Đang quét thư mục %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "Làm lại cây thư mục"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Cây thư mục sẽ được làm lại. Tiếp tục?"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "Đang làm lại cây thư mục..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "Việc làm lại cây thư mục thất bại."
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "Kiểm tra thư mới trong mọi thư mục..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "Rác"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Thư mục %s được chọn\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Đang tải thư về trong %s ..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Có lỗi khi tải thư về trong `%s'."
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2298,26 +2298,26 @@ msgstr ""
 "(nếu bạn muốn tạo một thư mục để lưu thư mục con,\n"
 " thêm `/' vào cuối tên)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Đặt tên cho `%s':"
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "Đổi tên thư mục"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Không thể đổi tên thư mục `%s'."
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Không thể di chuyển thư mục `%s'."
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2326,11 +2326,11 @@ msgstr ""
 "Xoá thư mục tìm kiếm `%s' ?\n"
 "Thư sẽ không bị xoá khỏi ổ cứng."
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 msgid "Delete search folder"
 msgstr "Xoá thư mục tìm kiếm"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2343,20 +2343,20 @@ msgstr ""
 "\n"
 "Bạn có thực sự muốn xoá không?"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Không thể xoá thư mục '%s'."
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "Đổi rác"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2365,34 +2365,34 @@ msgstr ""
 "Thực sự muốn xoá hộp thư `%s' ?\n"
 "(Thư sẽ KHÔNG bị xoá khỏi ổ cứng)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "Xoá hộp thư"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản IMAP4 `%s'?"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "Xoá tài khoản IMAP4"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Thực sự muốn xoá nhóm tin `%s'?"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "Xoá nhóm tin"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản tin tức `%s'?"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "Xoá tài khoản tin tức"
 
@@ -2538,143 +2538,143 @@ msgstr "Hoàn thành"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d thư mới"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "Đang xác thực"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "Đang tải về thư mới"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "Đợi"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "Đã bị huỷ bỏ"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "Đang tải về"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Xong (%d thư (%s) nhận được)"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "Xong (không có thư mới)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "Kết nối thất bại"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "Xác thực thất bại"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "Đã khoá"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "Hết giờ"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Hoàn tất (%d thư mới)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "Hoàn tất (không có thư mới)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "Xảy ra một số lỗi khi nhận thư."
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "đang nhận thư mới của tài khoản %s...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "Đang xác thực"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Đang nhận thư mới"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Đang kết nối tới máy chủ POP3: %s..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Không thể kết nối tới máy thủ POP3: %s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "Đang xác thực..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Đang lấy thư trên %s..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Đang xác định số lượng thư mới (STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Đang xác định số lượng thư mới (LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Đang xác định số lượng thư mới (UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "Đang xác định kích thước thư (LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "Đang xoá thư %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "Đang thoát"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Đang lấy thư (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Đang lấy về (đã nhận %d thư (%s))"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "Kết nối thất bại."
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2683,28 +2683,28 @@ msgstr ""
 "Có lỗi khi xử lí thư:\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "Ổ cứng bị đầy."
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "Không thể ghi lên tập tin"
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Lỗi socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "Kết nối bị ngắt bởi máy từ xa."
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "Hộp thư bị khoá."
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2713,11 +2713,11 @@ msgstr ""
 "Hộp thư bị khoá:\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "Xác thực thất bại."
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2726,15 +2726,15 @@ msgstr ""
 "Xác thực thất bại:\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "Phiên làm việc hết giờ."
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "Sáp nhập bị huỷ bỏ\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Đang lấy thư từ %s vào %s...\n"
@@ -2864,7 +2864,7 @@ msgstr "Các thư đang đợi gửi"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Một số thư chưa gửi đã được xếp hàng. Thoát bây giờ?"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2873,15 +2873,15 @@ msgstr ""
 "Việc hỗ trợ OpenGPG bị cấm."
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "một tiến trình Sylpheed khác đang chạy.\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "Di trú cấu hình"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2889,656 +2889,657 @@ 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:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/_Tập tin/_Thư mục"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Tập tin/_Thư mục/_Tạo thư mục mới..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Tập tin/_Thư mục/Đổi tê_n thư mục..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/_Tập tin/_Thư mục/_Di chuyển thư mục"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Tập tin/_Thư mục/_Xoá thư mục"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/_Tập tin/_Hộp thư"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/_Tập tin/_Hộp thư/_Thêm hộp thư..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Tập tin/_Hộp thư/_Xoá hộp thư"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/_Tập tin/_Hộp thư/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/_Tập tin/_Hộp thư/_Kiểm tra thư mới"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 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:531
+#: src/mainwindow.c:533
 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:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/_Tập tin/_Nhập khẩu tập tin mbox..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Tập tin/_Xuất khẩu tập tin mbox..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/_Tập tin/Đổ _rác"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/_Tập tin/_Lưu là..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/_Tập tin/_Lưu là..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/_Tập tin/I_n..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 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:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/_Tập tin/Th_oát"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/_Soạn/_Chọn luồng"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Soạn/_Tìm trong thư hiện tại..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/_Soạn/Tìm _kiếm thư..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/_Xem/_Hiện hoặc ẩn"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Cây thư mục"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Khung xem thư"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 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:570
+#: src/mainwindow.c:572
 #, 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:572
+#: src/mainwindow.c:574
 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:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Nhãn"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Xem/_Hiện hoặc ẩn/_Thanh công cụ/_Không"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/_Xem/_Hiện hoặc ẩn/T_hanh tìm kiếm"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Xem/_Hiện hoặc ẩn/T_hanh trạng thái"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/_Xem/_Cây thư mục riêng rẽ"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/_Xem/_Khung xem thư riêng rẽ"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/_Xem/_Sắp xếp"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/_Xem/_Sắp xếp/theo _số"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Xem/_Sắp xếp/theo _kích thước"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/_Xem/_Sắp xếp/th_eo thời gian"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 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:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/_Xem/_Sắp xếp/theo người _gửi"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Xem/_Sắp xếp/theo người _nhận"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Xem/_Sắp xếp/theo tiê_u đề"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Xem/_Sắp xếp/theo nhãn _màu"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Xem/_Sắp xếp/theo đánh _dấu"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/_Xem/_Sắp xếp/theo _chưa đọc"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Xem/_Sắp xếp/theo đín_h kèm"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Xem/_Sắp xếp/Không sắp _xếp"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/_Xem/_Sắp xếp/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Xem/_Sắp xếp/_Tăng dần"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/_Xem/_Sắp xếp/_Giảm dần"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Xem/_Sắp xếp/Tập t_rung theo tiêu đề"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/_Xem/_Xem theo luồng"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/_Xem/Mở mọi l_uồng"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Xem/Đón_g mọi luồng"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/_Xem/Chọ_n mục hiển thị..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/_Xem/Đi _tới"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Xem/Đi _tới/Thư _trước"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Xem/Đi _tới/Thư tiế_p theo"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/_Xem/Đi _tới/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Xem/Đi _tới/Thư trước (_chưa đọc)"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Xem/Đi _tới/Thư tiếp theo (chư_a đọc)"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Xem/Đi _tới/Thư trước (_mới)"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Xem/Đi _tới/T_hư tiếp theo (mới)"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Xem/Đi _tới/Thư trước (đánh _dấu)"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Xem/Đi _tới/Thư tiếp the_o (đánh dấu)"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Xem/Đi _tới/Thư trước (đã _gán nhãn)"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 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:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Xem/Mã _kí tự/_Tự động xác định"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Xem/Mã _kí tự/Đông Âu (Windows-1252)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 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:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Xem/Mã _kí tự/Nhật Bản (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Xem/Mã _kí tự/Hán phồn thể (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Xem/Mã _kí tự/Hán (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Xem/Mã _kí tự/Triều Tiên (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/_Xem/_Mở trong cửa sổ mới"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/_Xem/_Nguồn thư"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Xem/Mọi _header"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/_Xem/_Cập nhật tóm tắt"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/_Thư"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/_Thư/_Nhận"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Thư/_Nhận/_Từ tài khoản mặc định"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Thư/_Nhận/Từ _mọi tài khoản"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/_Thư/_Nhận/_Huỷ bỏ việc lấy thư"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Thư/_Nhận/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/_Thư/_Nhận/_Gửi thư đang xếp hàng"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/_Thư/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/_Thư/_Viết thư mới"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/_Thư/_Hồi âm"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/_Thư/Hồi â_m tới"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Thư/Hồi â_m tới/_tất cả"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Thư/Hồi â_m tới/_người gửi"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Thư/Hồi â_m tới/_hộp thư chung"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/_Thư/_Chuyển tiếp"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Thư/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/_Thư/Chu_yển hướng"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/_Thư/_Di chuyển..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/_Thư/_Sao chép"
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/_Thư/Đánh _dấu"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Thư/Đánh _dấu/Đánh _dấu"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Thư/Đánh _dấu/_Bỏ đánh dấu"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/_Thư/Đánh _dấu/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Thư/Đánh _dấu/C_hưa đọc"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Thư/Đánh _dấu/Đã đọ_c"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/_Thư/Đánh _dấu/Luồng đã được đọ_c"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Thư/Đánh _dấu/Đã đọc _tất cả"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/_Thư/_Xoá"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/_Thư/Đánh dấu là thư _rác"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Thư/Đánh dấu _không là thư rác"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/_Thư/S_oạn lại"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 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:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/_Công cụ/_Lọc mọi thư trong thư mục"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Công cụ/Lọ_c các thư đã chọn"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Công cụ/Tạo _quy tắc lọc"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/_Tự động"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 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:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 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:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo Tiê_u đề"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/_Công cụ/Lọc _thư rác trong thư mục"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 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:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Công cụ/_Xoá thư trùng"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "Chạy tiến trình đã đánh dấu"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/_Công cụ/Cửa sổ theo _dõi"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/Cấ_u hình"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Cấ_u hình/_Cấu hình chung..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/Cấ_u hình/_Thiết lập bộ lọc..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/Cấ_u hình/_Mẫu..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/Cấ_u hình/_Hành động..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/Cấ_u hình/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 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:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/Cấ_u hình/Tạ_o tài khoản mới..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Cấ_u hình/_Sửa tài khoản..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/Cấ_u hình/Đổi tài _khoản mặc định"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/_Hỗ trợ/_Sổ tay hướng dẫn"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/_Hỗ trợ/_Sổ tay hướng dẫn/Tiếng _Anh"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/_Hỗ trợ/_Sổ tay hướng dẫn/Tiếng _Nhật"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/Tiếng _Anh"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/Tiếng Đứ_c"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/Tiếng _Tây Ban Nha"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/Tiếng _Pháp"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/_Hỗ trợ/_Câu hỏi thường gặp/_Tiếng Italia"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 msgid "/_Help/_Command line options"
 msgstr "/_Hỗ trợ/Tuỳ chọn _dòng lệnh"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/_Hỗ trợ/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "Đang tạo cửa sổ chính...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, 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:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "xong.\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "Chưa đặt tên"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "không"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "Đổi kiểu vạch phân cách cửa sổ từ %d sang %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "Ngoại tuyến"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "Bạn đang ngoại tuyến. Chuyển sang trực tuyến?"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "Đổ mọi thùng rác"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "Thêm hộp thư"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3548,16 +3549,16 @@ msgstr ""
 "Nếu hộp thư có trước được chỉ định, nó sẽ được\n"
 "tự động quét."
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Hộp thư `%s' đã có trước."
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "Hộp thư"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3566,67 +3567,67 @@ 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:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Khung thư mục"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Khung đọc thư"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/_Hồi âm"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/Hồi âm _tất cả"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/Hồi âm cho người _gửi"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/Hồi âm cho _hộp thư chung"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/_Chuyển tiếp"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/Chu_yển hướng"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 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:2837
+#: src/mainwindow.c:2849
 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:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "Thoát"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "Thoát chương trình này?"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 msgid "Command line options"
 msgstr "Tuỳ chọn dòng lệnh"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Cách dùng: sylpheed [TUỲ CHỌN]..."
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3654,7 +3655,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3887,7 +3888,7 @@ msgstr "Tài khoản %d"
 msgid "Preferences for new account"
 msgstr "Cấu hình cho tài khoản mới"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "Cấu hình tài khoản"
 
@@ -3900,7 +3901,7 @@ msgid "Receive"
 msgstr "Nhận"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "Gửi"
 
@@ -4114,7 +4115,7 @@ msgstr "Xác thực với POP3 trước khi gửi"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "Chữ kí"
 
@@ -4570,7 +4571,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "Trình soạn thảo"
 
@@ -5673,7 +5674,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Xoá [...] hoặc (...) ở đầu tiêu đề khi hồi âm"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "Tài khoản"
 
@@ -5886,81 +5887,91 @@ msgstr "In ấn"
 msgid "Print message"
 msgstr "Gửi thư"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "Bước"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "Máy chủ nhận"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "Chạy"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "Chạy tiến trình đã đánh dấu"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 #, fuzzy
 msgid "Prefs"
 msgstr "Trước"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "Cấu hình chung"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "Gửi thư"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "Gửi sau"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "Đưa vào thư mục `Đợi gửi' và gửi sau"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "Bản nháp"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "Gửi vào thư mục nháp"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "Chèn"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "Chèn tập tin"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "Đính kèm"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "Đính kèm tập tin"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 msgid "Append signature"
 msgstr "Chèn chữ kí "
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "Soạn với trình soạn thảo ngoài"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "Khuôn dòng"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "Khuôn mọi dòng dài"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/_Xem/Đi _tới/Thư mụ_c khác..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6210,7 +6221,7 @@ msgstr "Không thấy chữ kí nào"
 msgid "Good signature from \"%s\""
 msgstr "Chữ kí chuẩn từ \"%s\""
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "Chữ kí chuẩn"
 
@@ -6219,7 +6230,7 @@ msgstr "Chữ kí chuẩn"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Chữ kí hợp lệ nhưng khoá ch \"%s\" không tin cậy"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "Chữ kí hợp lệ (chưa tin cậy)"
 
@@ -6255,7 +6266,7 @@ msgstr "Chữ kí hợp lệ nhưng khoá để kí đã bị thu hồi"
 msgid "BAD signature from \"%s\""
 msgstr "Chữ kí GIẢ từ \"%s\""
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "Chữ kí GIẢ"
 
@@ -6702,41 +6713,45 @@ msgstr "tập tin %s đã có trước\n"
 msgid "Creating text view...\n"
 msgstr "Đang tạo khung xem văn bản...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "Không thể hiển thị được thư này.\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "_Lưu hình ảnh này là..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "Soạn _thư mới"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "Thêm vào _sổ địa chỉ..."
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "_Chép địa chỉ này"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "_Mở với trình duyệt web"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "Sao chép liên _kết này"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6749,7 +6764,7 @@ msgstr ""
 "\n"
 "Vẫn mở nó?"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "Cảnh báo URL lừa đảo"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 60dcd2f6..d9be28a0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -54,162 +54,162 @@ msgstr "正在发送邮件 (%d / %d 字节)"
 msgid "Moving messages %s to %s ..."
 msgstr "正在移动邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "正在从 %s 获取邮件..."
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "无法设置删除标志：%s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "无法清除\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "正在从 %s 获取邮件..."
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "无法设置删除标志：1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "无法关闭文件夹\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "根文件夹 %s 不存在\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "获取列表时发生错误。\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "无法创建“%s”\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "无法在收件箱中创建“%s”\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "无法创建邮箱：LIST 失败\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "无法创建邮箱\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "无法将邮箱 %s 重命名为 %s\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "无法删除邮箱\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "无法获取信封\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "获取信封时发生错误。\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "无法解析信封：%s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "无法获得名字空间\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "无法选择文件夹：%s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 验证失败。\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登录失败。\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "无法把 %s 添加到 %s\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "(正在发送文件...)"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "无法追加邮件到 %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "无法将 %s 复制到 %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "执行IMAP命令时发生错误：STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "执行IMAP命令时发生错误：EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv 无法转换 UTF-7 到 %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 无法转换 %s 到 UTF-7\n"
@@ -301,20 +301,20 @@ msgstr "正在从 %s 导出信件到 %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "无法复制邮件 %s 到 %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "无法打开标记文件。\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "源文件夹与目的文件夹是同一个。\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -323,7 +323,7 @@ msgstr ""
 "文件“%s”已存在。\n"
 "无法创建文件件。"
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -593,12 +593,12 @@ msgstr "  标题：%s\n"
 msgid "  Issuer: %s\n"
 msgstr "  签发者：%s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "写入 %s 时失败。\n"
@@ -678,7 +678,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -815,7 +815,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
 
@@ -828,7 +828,7 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -851,9 +851,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
@@ -875,11 +875,11 @@ msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
@@ -916,7 +916,7 @@ msgstr "/地址(_A)/编辑(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -925,12 +925,12 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
@@ -977,7 +977,7 @@ msgstr "/编辑(_E)/粘贴(_P)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "地址簿"
 
@@ -1042,7 +1042,7 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "删除文件夹"
 
@@ -1192,15 +1192,15 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "错误"
 
@@ -1301,7 +1301,7 @@ msgstr "/编辑(_E)/撤销(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复(_R)"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
@@ -1314,7 +1314,7 @@ msgstr "/编辑(_E)/剪切(_T)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引文粘贴(_Q)"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_A)"
 
@@ -1330,7 +1330,7 @@ msgstr "/编辑(_E)/所有长行折行(_L)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/查看(_V)"
@@ -1352,9 +1352,9 @@ msgid "/_View/_Reply to"
 msgstr "/查看(_V)/回复至(_R)"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
 
@@ -1375,7 +1375,7 @@ msgstr "/查看(_V)/附件(_A)"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
@@ -1386,118 +1386,118 @@ msgstr "/查看(_V)/字符编码(_E)/自动(_A)"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_E)/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符编码(_E)/7位 ASCII (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符编码(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符编码(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-13)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符编码(_E)/土耳其语 (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
@@ -1505,13 +1505,13 @@ msgstr "/工具(_T)/地址簿(_A)"
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
@@ -1547,71 +1547,71 @@ msgstr "%s：文件不存在\n"
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1619,21 +1619,21 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1643,12 +1643,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1657,15 +1657,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1674,85 +1674,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1762,51 +1762,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -1964,12 +1964,12 @@ msgstr "编辑文件夹"
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -2137,42 +2137,42 @@ msgstr "邮件池目录"
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "收件箱"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "已发送"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "队列"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "废件箱"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "草稿箱"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "新文件夹"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "无法创建文件夹“%s”。"
@@ -2262,56 +2262,56 @@ msgstr "正在设置文件夹信息...\n"
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "重建文件夹树"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "文件夹树将重建。继续吗？"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "正在重建文件夹树..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建文件夹树失败。"
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "正在检查所有文件夹中的新邮件..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "选中文件夹 %s\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "正在下载 %s 中的邮件..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "下载“%s”中的邮件时发生错误。"
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2321,26 +2321,26 @@ msgstr ""
 "(如果您要创建一个保存子文件夹的文件夹，\n"
 "在名字的最后添加“/”)"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "输入“%s”的新名字："
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "重命名文件件"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2349,12 +2349,12 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 #, fuzzy
 msgid "Delete search folder"
 msgstr "删除文件夹"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2365,21 +2365,21 @@ msgstr ""
 "“%s”下的所有文件夹和邮件将被删除。\n"
 "您真的要删除吗？"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "清空废件箱"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2388,34 +2388,34 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "真的要删除 IMAP4 帐号“%s”？"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组“%s”？"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号“%s”？"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
@@ -2561,143 +2561,143 @@ msgstr "完成"
 msgid "Sylpheed: %d new messages"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "正在验证"
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "正在获取新邮件"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "请等待"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "正在获取"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "完成 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "验证失败"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "锁住"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "超时"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "获取邮件时发生错误。"
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "正在获取帐号 %s 的新邮件...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "正在验证"
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s：正在获取新邮件"
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "正在连接POP3服务器：%s..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "正在验证..."
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "正在从 %s 获取邮件..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在获取新邮件数量(LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在获取新邮件数量(UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在获取新邮件的大小(LIST)..."
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "正在退出"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "正在获取 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "连接失败"
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2706,28 +2706,28 @@ msgstr ""
 "处理邮件时发生错误：\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "没有剩余磁盘空间。"
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "无法写入文件。"
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "信箱被锁住。"
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2736,11 +2736,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2749,15 +2749,15 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "会话超时。"
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件被取消\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -2881,7 +2881,7 @@ msgstr "队列中的邮件"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "一些未发送的信件被放入队列。现在退出吗？"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2890,15 +2890,15 @@ msgstr ""
 "已禁用 OpenPGP 支持。"
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "另外一个 Sylpheed 正在运行。\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "正在迁移配置"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2906,668 +2906,669 @@ msgstr ""
 "发现以前版本的配置。\n"
 "您要迁移吗？"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/文件(_F)/文件夹(_F)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/文件(_F)/文件夹(_F)/新建文件夹(_N)..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/文件(_F)/文件夹(_F)/重命名文件夹(_R)..."
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 #, fuzzy
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/文件(_F)/文件夹(_F)/重命名文件夹(_R)..."
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/文件(_F)/文件夹(_F)/删除文件夹(_D)"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/文件(_F)/邮箱(_M)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/文件(_F)/邮箱(_M)/添加邮箱(_M)..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/文件(_F)/邮箱(_M)/删除邮箱(_R)..."
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/文件(_F)/邮箱(_M)/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/文件(_F)/邮箱(_M)/检查新邮件(_C)"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/文件(_F)/邮箱(_M)/检查所有邮箱的新邮件(_A)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/文件(_F)/邮箱(_M)/重建文件夹树(_E)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/文件(_F)/导入mbox文件(_I)..."
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/文件(_F)/导出到mbox文件(_E)..."
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/文件(_F)/清空废件箱(_T)"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/文件(_F)/另存为(_S)..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/文件(_F)/另存为(_S)..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/文件(_F)/打印(_P)..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/文件(_F)/离线工作(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/文件(_F)/退出(_X)"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/编辑(_E)/选择线索(_T)"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/编辑(_E)/在当前邮件中查找(_F)..."
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/编辑(_E)/查找邮件(_S)..."
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/查看(_V)/显示或隐藏(_D)"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/查看(_V)/显示或隐藏(_D)/文件夹树(_F)"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/查看(_V)/显示或隐藏(_D)/邮件视图(_M)"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标和文字(_A)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标(_I)"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/图标(_I)"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/文字(_T)"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/查看(_V)/显示或隐藏(_D)/工具栏(_T)/无(_N)"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/查看(_V)/显示或隐藏(_D)/状态栏(_B)"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/查看(_V)/显示或隐藏(_D)/状态栏(_B)"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/查看(_V)/分离文件夹树窗口(_O)"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/查看(_V)/分离邮件视图窗口(_M)"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/查看/排序(_S)"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/查看(_V)/排序(_S)/按序号(_N)"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/查看(_V)/排序(_S)/按大小(_I)"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 #, fuzzy
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/查看(_V)/排序(_S)/按发件人(_F)"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/查看(_V)/排序(_S)/按收件人(_R)"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/查看(_V)/排序(_S)/按主题(_S)"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/查看(_V)/排序(_S)/按颜色标注(_C)"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/查看(_V)/排序(_S)/按标记(_M)"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/查看(_V)/排序(_S)/按未读(_U)"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/查看(_V)/排序(_S)/按附件(_T)"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/查看(_V)/排序(_S)/不排序(_O)"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/查看(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/查看(_V)/排序(_S)/升序"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/查看(_V)/排序(_S)/降序"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/查看(_V)/排序(_S)/按主题集中(_A)"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/查看(_V)/按线索查看(_R)"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/查看(_V)/展开所有线索(_X)"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/查看(_V)/收缩所有线索(_L)"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/查看(_V)/设置显示项(_I)..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/查看(_V)/转到(_G)"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/查看(_V)/转到(_G)/上一个邮件(_P)"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/查看(_V)/转到(_G)/下一个邮件(_N)"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/查看(_V)/转到(_G)/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/查看(_V)/转到(_G)/上一个未读邮件(_R)"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/查看(_V)/转到(_G)/下一个未读邮件(_E)"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/查看(_V)/转到(_G)/上一个新邮件(_W)"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/查看(_V)/转到(_G)/下一个新邮件(_X)"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/查看(_V)/转到(_G)/上一个标记的邮件(_M)"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/查看(_V)/转到(_G)/下一个标记的邮件(_A)"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/查看(_V)/转到(_G)/上一个用颜色标注的邮件(_L)"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/查看(_V)/转到(_G)/下一个用颜色标注的邮件(_B)"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/查看(_V)/字符编码(_E)/自动检测(_A)"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/查看(_V)/字符编码(_E)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_W)"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_A)"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/查看(_V)/所有标题(_H)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新摘要(_U)"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/邮件(_M)"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/邮件(_M)/接收(_V)"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/邮件(_M)/接收(_V)/当前帐号(_C)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/邮件(_M)/接收(_V)/所有帐号(_A)"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/邮件(_M)/接收(_V)/取消(_G)"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/邮件(_M)/接收(_V)/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/邮件(_M)/发送队列中的邮件(_S)"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/邮件(_M)/撰写新邮件(_N)"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回复(_R)"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回复到(_Y)"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回复到(_Y)/所有人(_AL)"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回复到(_Y)/发件人(_S)"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回复到(_Y)/邮件列表(_L)"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/邮件(_M)/作为附件转发(_W)"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/邮件(_M)/重定向(_T)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/邮件(_M)/移动(_O)..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/邮件(_M)/复制(_C)..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/邮件(_M)/标记(_M)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/邮件(_M)/标记(_M)/标记(_M)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/邮件(_M)/标记(_M)/取消标记(_U)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/邮件(_M)/标记(_M)/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/邮件(_M)/标记(_M)/标记为未读(_E)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_D)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_D)"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/邮件(_M)/标记(_M)/全部标记为已读(_R)"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/邮件(_M)/删除(_D)"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 #, fuzzy
 msgid "/_Message/Set as _junk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 #, fuzzy
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_E)"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 #, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/工具(_T)/将发件人添加到地址簿中(_K)"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动(_A)"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/按发件人(_F)"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/按收件人(_T)"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/按主题(_S)"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 #, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 #, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/删除重复的邮件(_P)"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "执行标记的处理"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/记录窗口(_L)"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/配置(_C)"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/配置(_C)/通用首选项(_C)..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/配置(_C)/过滤设置(_F)..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/配置(_C)/模板(_T)..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/配置(_C)/动作(_A)..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/配置(_C)/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/配置(_C)/当前帐号首选项(_P)..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/配置(_C)/创建新帐号(_N)..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/配置(_C)/编辑帐号(_E)..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/配置(_C)/改变当前帐号(_H)"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/帮助(_H)/手册(_M)"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/帮助(_H)/手册(_M)/英语(_E)"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/帮助(_H)/手册(_M)/日语(_J)"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/帮助(_H)/常见问题(_F)"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/帮助(_H)/常见问题(_F)/英语(_E)"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/帮助(_H)/常见问题(_F)/德语(_G)"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/帮助(_H)/常见问题(_F)/西班牙语(_S)"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/帮助(_H)/常见问题(_F)/法语(_F)"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/帮助(_H)/常见问题(_F)/意大利语(_I)"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "没有设置命令行。"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/帮助(_H)/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "正在创建主窗口...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "无标题"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "无"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在把窗口分隔方式从 %d 改到 %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "离线"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "您处于离线状态。切换到在线状态吗？"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "清空所有废件箱"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 #, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "添加邮箱"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 #, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
@@ -3577,16 +3578,16 @@ msgstr ""
 "输入邮箱位置。\n"
 "如果指定了已存在的邮箱，它将被自动扫描。"
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3595,69 +3596,69 @@ msgstr ""
 "创建邮件箱失败。\n"
 "也许某些文件已经存在，或者您没有写权限。"
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed－文件夹视图"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/回复到所有人(_A)"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/回复到发件人(_S)"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr "您处于离线状态。单击图标切换到在线状态。"
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "您处于在线状态。单击图标切换到离线状态。"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "退出"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "要退出本程序吗？"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 #, fuzzy
 msgid "Command line options"
 msgstr "没有设置命令行。"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3673,7 +3674,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3893,7 +3894,7 @@ msgstr "帐号%d"
 msgid "Preferences for new account"
 msgstr "新帐号的首选项"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "帐号首选项"
 
@@ -3906,7 +3907,7 @@ msgid "Receive"
 msgstr "接收"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "发送"
 
@@ -4125,7 +4126,7 @@ msgstr "发送前用POP3验证"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "签名"
 
@@ -4587,7 +4588,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "编辑器"
 
@@ -5716,7 +5717,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "回复时删除主题前的 [...] 或 (...)"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "帐号"
 
@@ -5931,81 +5932,91 @@ msgstr "打印"
 msgid "Print message"
 msgstr "立即发送邮件"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "每次滚动"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "接收服务器"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "执行"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "执行标记的处理"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "首选项"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "通用首选项"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "立即发送邮件"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "以后发送"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "放入队列文件夹，在以后发送"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "草稿"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "保存到草稿文件夹"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "插入"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "插入文件内容"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "附件"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "加入附件"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 #, fuzzy
 msgid "Append signature"
 msgstr "签名错误"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "使用外部编辑器编辑"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "换行"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6262,7 +6273,7 @@ msgstr "没有找到签名"
 msgid "Good signature from \"%s\""
 msgstr "来自“%s”的正确签名"
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "正确的签名"
 
@@ -6271,7 +6282,7 @@ msgstr "正确的签名"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "签名有效，但是“%s”的密钥不被信任"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "签名有效 (非信任的密钥)"
 
@@ -6307,7 +6318,7 @@ msgstr "签名有效，但签名密钥已经被废止"
 msgid "BAD signature from \"%s\""
 msgstr "“%s”的签名错误"
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "签名错误"
 
@@ -6762,45 +6773,49 @@ msgstr "文件 %s 已经存在。\n"
 msgid "Creating text view...\n"
 msgstr "正在创建文本视图...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "无法显示该邮件。\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "图像另存为(_V)..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 #, fuzzy
 msgid "Compose _new message"
 msgstr "撰写新邮件"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/添加发件人到地址簿(_K)"
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "复制链接(_L)"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "网页浏览器"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "复制链接(_L)"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6812,7 +6827,7 @@ msgstr ""
 "显示的 URL (%s) 不同。\n"
 "仍然要打开吗？"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f4f025e7..6c0a097f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-28 12:49+0900\n"
+"POT-Creation-Date: 2007-04-03 14:10+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -54,161 +54,161 @@ msgstr "附加郵件至 %s (%d / %d)"
 msgid "Moving messages %s to %s ..."
 msgstr "正在移動郵件 %s 到 %s ..."
 
-#: libsylph/imap.c:1375
+#: libsylph/imap.c:1374
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "正在複製郵件 %s 到 %s ..."
 
-#: libsylph/imap.c:1514
+#: libsylph/imap.c:1512
 #, c-format
 msgid "Removing messages %s"
 msgstr "正在移除郵件 %s"
 
-#: libsylph/imap.c:1520
+#: libsylph/imap.c:1518
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "無法設定刪除的旗標：%s\n"
 
-#: libsylph/imap.c:1528 libsylph/imap.c:1623
+#: libsylph/imap.c:1526 libsylph/imap.c:1621
 msgid "can't expunge\n"
 msgstr "無法刪除\n"
 
-#: libsylph/imap.c:1611
+#: libsylph/imap.c:1609
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "正在移除 %s 中的所有郵件"
 
-#: libsylph/imap.c:1617
+#: libsylph/imap.c:1615
 msgid "can't set deleted flags: 1:*\n"
 msgstr "無法設定刪除的旗標：1:*\n"
 
-#: libsylph/imap.c:1665
+#: libsylph/imap.c:1663
 msgid "can't close folder\n"
 msgstr "無法選擇資料夾\n"
 
-#: libsylph/imap.c:1743
+#: libsylph/imap.c:1741
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "根資料夾 %s 不存在。\n"
 
-#: libsylph/imap.c:1932 libsylph/imap.c:1940
+#: libsylph/imap.c:1930 libsylph/imap.c:1938
 msgid "error occurred while getting LIST.\n"
 msgstr "取得 LIST 時發生錯誤。\n"
 
-#: libsylph/imap.c:2054
+#: libsylph/imap.c:2052
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "無法產生 %s\n"
 
-#: libsylph/imap.c:2059
+#: libsylph/imap.c:2057
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "無法在收件夾下產生 %s\n"
 
-#: libsylph/imap.c:2120
+#: libsylph/imap.c:2118
 msgid "can't create mailbox: LIST failed\n"
 msgstr "無法產生信箱：LIST 失敗\n"
 
-#: libsylph/imap.c:2140
+#: libsylph/imap.c:2138
 msgid "can't create mailbox\n"
 msgstr "無法產生信箱\n"
 
-#: libsylph/imap.c:2244
+#: libsylph/imap.c:2239
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "信箱 %s 無法更名為 %s\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2319
 msgid "can't delete mailbox\n"
 msgstr "無法刪除信箱\n"
 
-#: libsylph/imap.c:2368
+#: libsylph/imap.c:2363
 msgid "can't get envelope\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:2381
+#: libsylph/imap.c:2376
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "擷取郵件表頭 (%d / %d)"
 
-#: libsylph/imap.c:2391
+#: libsylph/imap.c:2386
 msgid "error occurred while getting envelope.\n"
 msgstr "取得信封時發生錯誤。\n"
 
-#: libsylph/imap.c:2413
+#: libsylph/imap.c:2408
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "無法解析信封：%s\n"
 
-#: libsylph/imap.c:2537
+#: libsylph/imap.c:2532
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器：%s:%d\n"
 
-#: libsylph/imap.c:2544
+#: libsylph/imap.c:2539
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "無法產生 IMAP4 連線：%s:%d\n"
 
-#: libsylph/imap.c:2619
+#: libsylph/imap.c:2614
 msgid "can't get namespace\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:3152
+#: libsylph/imap.c:3147
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾：%s\n"
 
-#: libsylph/imap.c:3187
+#: libsylph/imap.c:3182
 msgid "error on imap command: STATUS\n"
 msgstr "發生錯誤的 imap 命令： STATUS\n"
 
-#: libsylph/imap.c:3310 libsylph/imap.c:3345
+#: libsylph/imap.c:3305 libsylph/imap.c:3340
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 認證失敗\n"
 
-#: libsylph/imap.c:3394
+#: libsylph/imap.c:3389
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登入失敗。\n"
 
-#: libsylph/imap.c:3731
+#: libsylph/imap.c:3726
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "無法將郵件從 %s 搬移到 %s。\n"
 
-#: libsylph/imap.c:3738
+#: libsylph/imap.c:3733
 msgid "(sending file...)"
 msgstr "（送出檔案 ...）"
 
-#: libsylph/imap.c:3767
+#: libsylph/imap.c:3762
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "無法附加訊息到 %s\n"
 
-#: libsylph/imap.c:3799
+#: libsylph/imap.c:3794
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "無法將郵件 %s 移到 %s\n"
 
-#: libsylph/imap.c:3823
+#: libsylph/imap.c:3818
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 發生錯誤，命令為： STORE %s %s\n"
 
-#: libsylph/imap.c:3837
+#: libsylph/imap.c:3832
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 發生錯誤，命令為： EXPUNGE\n"
 
-#: libsylph/imap.c:3850
+#: libsylph/imap.c:3845
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 發生錯誤，命令為： CLOSE\n"
 
-#: libsylph/imap.c:4126
+#: libsylph/imap.c:4121
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "無法將 UTF-7 轉換為 %s\n"
 
-#: libsylph/imap.c:4156
+#: libsylph/imap.c:4151
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "無法轉換 %s 為 UTF-7\n"
@@ -300,20 +300,20 @@ msgstr "將郵件由 %s 匯出到 %s 中...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "無法將郵件從 %s 搬移到 %s。\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:663
+#: libsylph/mh.c:540 libsylph/mh.c:662
 msgid "Can't open mark file.\n"
 msgstr "無法開啟標記的檔案。\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:669
+#: libsylph/mh.c:547 libsylph/mh.c:668
 msgid "the src folder is identical to the dest.\n"
 msgstr "來源與目的資料夾相同。\n"
 
-#: libsylph/mh.c:672
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
+#: libsylph/mh.c:671
+#, fuzzy, c-format
+msgid "Copying message %s/%d to %s ...\n"
 msgstr "正在複製訊息 %s%c%d 到 %s ...\n"
 
-#: libsylph/mh.c:1003 libsylph/mh.c:1016 src/main.c:149
+#: libsylph/mh.c:1001 libsylph/mh.c:1014 src/main.c:149
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -322,7 +322,7 @@ msgstr ""
 "檔案「%s」已存在。\n"
 "無法產生資料夾。"
 
-#: libsylph/mh.c:1538
+#: libsylph/mh.c:1537
 #, c-format
 msgid ""
 "Directory name\n"
@@ -597,12 +597,12 @@ msgstr "  主旨: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  發信人: %s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
-#: src/compose.c:3349 src/compose.c:3469
+#: libsylph/utils.c:2532 src/compose.c:3002 src/compose.c:3294
+#: src/compose.c:3357 src/compose.c:3477
 msgid "can't change file mode\n"
 msgstr "無法改變檔案型態\n"
 
-#: libsylph/utils.c:2531 libsylph/utils.c:2655
+#: libsylph/utils.c:2539 libsylph/utils.c:2663
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "寫入到 %s 的動作失敗。\n"
@@ -683,7 +683,7 @@ msgstr ""
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
-#: src/compose.c:4470 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4478 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -818,7 +818,7 @@ msgstr "使用者設定之命令參數"
 msgid "Add Address to Book"
 msgstr "將地址加入通訊錄"
 
-#: src/addressadd.c:187 src/prefs_toolbar.c:81 src/select-keys.c:320
+#: src/addressadd.c:187 src/prefs_toolbar.c:84 src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
 
@@ -831,7 +831,7 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:515
+#: src/addressbook.c:349 src/compose.c:544 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/檔案(_F)"
@@ -854,9 +854,9 @@ msgid "/_File/New _LDAP Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
 #: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:549
-#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:533
-#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:540
-#: src/mainwindow.c:545 src/mainwindow.c:547 src/messageview.c:151
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:535
+#: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
+#: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
 #: src/messageview.c:156
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
@@ -878,11 +878,11 @@ msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
 #: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
-#: src/compose.c:563 src/mainwindow.c:551 src/messageview.c:159
+#: src/compose.c:563 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:552
+#: src/addressbook.c:366 src/compose.c:568 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
@@ -919,7 +919,7 @@ msgstr "/地址(_A)/編輯(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:793
+#: src/addressbook.c:377 src/compose.c:679 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -928,12 +928,12 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:847
+#: src/addressbook.c:380 src/compose.c:700 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:859
+#: src/addressbook.c:381 src/compose.c:701 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
@@ -980,7 +980,7 @@ msgstr "/編輯(_E)/貼上(_P)"
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:82
+#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "通訊錄"
 
@@ -1045,7 +1045,7 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1663 src/folderview.c:2433
+#: src/addressbook.c:1663 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
@@ -1197,15 +1197,15 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:5727 src/main.c:640
+#: src/alertpanel.c:142 src/compose.c:5735 src/main.c:640
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:155 src/main.c:752
+#: src/alertpanel.c:155 src/main.c:754
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:727
 msgid "Error"
 msgstr "錯誤"
 
@@ -1306,7 +1306,7 @@ msgstr "/編輯(_E)/復原(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/編輯(_E)/重複前一個動作(_R)"
 
-#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:555
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:557
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/編輯(_E)/---"
@@ -1319,7 +1319,7 @@ msgstr "/編輯(_E)/剪下(_T)"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/編輯(_E)/貼進引言(_Q)"
 
-#: src/compose.c:572 src/mainwindow.c:553 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:555 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/編輯(_E)/全選(_A)"
 
@@ -1335,7 +1335,7 @@ msgstr "/編輯(_E)/將所有過長的列折換(_L)"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/編輯(_E)/自動折列(_O)"
 
-#: src/compose.c:579 src/mainwindow.c:560 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:562 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/顯示(_V)"
@@ -1357,9 +1357,9 @@ msgid "/_View/_Reply to"
 msgstr "/顯示(_V)/回覆(_R)"
 
 #: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
-#: src/compose.c:593 src/mainwindow.c:583 src/mainwindow.c:586
-#: src/mainwindow.c:613 src/mainwindow.c:637 src/mainwindow.c:740
-#: src/mainwindow.c:744 src/messageview.c:258
+#: src/compose.c:593 src/mainwindow.c:585 src/mainwindow.c:588
+#: src/mainwindow.c:615 src/mainwindow.c:639 src/mainwindow.c:742
+#: src/mainwindow.c:746 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/顯示(_V)/---"
 
@@ -1380,7 +1380,7 @@ msgstr "/顯示(_V)/附加(_A)"
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/顯示(_V)/前往(_G)/到其他資料夾(_F)"
 
-#: src/compose.c:599 src/mainwindow.c:644 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:646 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/檢視(_V)/字元編碼(_E)"
 
@@ -1391,115 +1391,115 @@ msgstr "/檢視(_V)/字元編碼(_E)/自動(_A)"
 #: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
 #: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
 #: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
-#: src/compose.c:672 src/mainwindow.c:640 src/mainwindow.c:647
+#: src/compose.c:672 src/mainwindow.c:642 src/mainwindow.c:649
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/檢視(_V)/字元編碼(_E)/---"
 
-#: src/compose.c:604 src/mainwindow.c:648 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/顯示(_V)/字元編碼(_E)/7位元 ASCII (US-ASC_II)"
 
-#: src/compose.c:606 src/mainwindow.c:650 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/顯示(_V)/字元編碼(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:610 src/mainwindow.c:654 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:656 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-_1)"
 
-#: src/compose.c:612 src/mainwindow.c:656 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:658 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-15)"
 
-#: src/compose.c:616 src/mainwindow.c:662 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/顯示(_V)/字元編碼(_E)/中歐語系 (ISO-8859-_2)"
 
-#: src/compose.c:620 src/mainwindow.c:666 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:668 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-13)(_B)"
 
-#: src/compose.c:622 src/mainwindow.c:668 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-_4)"
 
-#: src/compose.c:624 src/mainwindow.c:670 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:672 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:628 src/mainwindow.c:674 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/顯示(_V)/字元編碼(_E)/希臘語 (ISO-8859-_7)"
 
-#: src/compose.c:632 src/mainwindow.c:678 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/顯示(_V)/字元編碼(_E)/波羅的海語系 (ISO-8859-_4)"
 
-#: src/compose.c:634 src/mainwindow.c:680 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:684 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:208
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/顯示(_V)/字元編碼(_E)/希臘語 (ISO-8859-_8)"
 
-#: src/compose.c:640 src/mainwindow.c:686 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:688 src/messageview.c:210
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1255)"
 
-#: src/compose.c:644 src/mainwindow.c:690 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/顯示(_V)/字元編碼(_E)/土耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:648 src/mainwindow.c:694 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (ISO-8859-_5)"
 
-#: src/compose.c:650 src/mainwindow.c:696 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:698 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (KOI8-_R)"
 
-#: src/compose.c:652 src/mainwindow.c:698 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (KOI8-U)"
 
-#: src/compose.c:654 src/mainwindow.c:700 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:702 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/顯示(_V)/字元編碼(_E)/斯拉夫語 (Windows-1251)"
 
-#: src/compose.c:658 src/mainwindow.c:704 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:706 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (ISO-2022-_JP)"
 
-#: src/compose.c:662 src/mainwindow.c:714 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:716 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/顯示(_V)/字元編碼(_E)/簡體中文 (_GB2312)"
 
-#: src/compose.c:664 src/mainwindow.c:716 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:718 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/顯示(_V)/字元編碼(_E)/簡體中文 (_GBK)"
 
-#: src/compose.c:666 src/mainwindow.c:718 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:720 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/顯示(_V)/字元編碼(_E)/繁體中文 (_Big5)"
 
-#: src/compose.c:670 src/mainwindow.c:726 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:728 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/顯示(_V)/字元編碼(_E)/韓文 (EUC-_KR)"
 
-#: src/compose.c:674 src/mainwindow.c:732 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:734 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/顯示(_V)/字元編碼(_E)/泰文 (TIS-620)"
 
-#: src/compose.c:676 src/mainwindow.c:734 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:736 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/顯示(_V)/字元編碼(_E)/泰文 (Windows-874)"
 
-#: src/compose.c:680 src/mainwindow.c:794 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:796 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/通訊錄(_A)"
 
@@ -1507,13 +1507,13 @@ msgstr "/工具(_T)/通訊錄(_A)"
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用郵件樣板(_T)"
 
-#: src/compose.c:683 src/mainwindow.c:818 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:820 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/執行外部指令(_N)"
 
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:797
-#: src/mainwindow.c:811 src/mainwindow.c:816 src/mainwindow.c:819
-#: src/mainwindow.c:823 src/mainwindow.c:825 src/messageview.c:286
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:799
+#: src/mainwindow.c:813 src/mainwindow.c:818 src/mainwindow.c:821
+#: src/mainwindow.c:825 src/mainwindow.c:827 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/工具(_T)"
@@ -1549,70 +1549,70 @@ msgstr "%s: 檔案不存在\n"
 msgid "Can't get text part\n"
 msgstr "沒有文字部份\n"
 
-#: src/compose.c:1544
+#: src/compose.c:1552
 msgid "Quote mark format error."
 msgstr "引言格式錯誤。"
 
-#: src/compose.c:1556
+#: src/compose.c:1564
 msgid "Message reply/forward format error."
 msgstr "回覆/轉寄郵件格式錯誤。"
 
-#: src/compose.c:2041
+#: src/compose.c:2049
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "檔案 %s 不存在\n"
 
-#: src/compose.c:2045
+#: src/compose.c:2053
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "無法取得檔案 %s 的大小\n"
 
-#: src/compose.c:2049
+#: src/compose.c:2057
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空的。"
 
-#: src/compose.c:2053
+#: src/compose.c:2061
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s。"
 
-#: src/compose.c:2086
+#: src/compose.c:2094
 #, c-format
 msgid "Message: %s"
 msgstr "郵件：%s"
 
-#: src/compose.c:2146 src/mimeview.c:558
+#: src/compose.c:2154 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2638 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
-#: src/compose.c:2633
+#: src/compose.c:2641
 #, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 編寫郵件%s"
 
-#: src/compose.c:2748
+#: src/compose.c:2756
 msgid "Recipient is not specified."
 msgstr "沒有指定收件人。"
 
-#: src/compose.c:2756
+#: src/compose.c:2764
 msgid "Empty subject"
 msgstr "主旨空白"
 
-#: src/compose.c:2757
+#: src/compose.c:2765
 msgid "Subject is empty. Send it anyway?"
 msgstr "沒有主旨。確定要送出？"
 
-#: src/compose.c:2816
+#: src/compose.c:2824
 msgid "can't get recipient list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/compose.c:2836
+#: src/compose.c:2844
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1620,21 +1620,21 @@ msgstr ""
 "您選用的帳號並非一個電子郵件帳號，可能是用來在新聞群組上發表文章用的。\n"
 "要發送郵件請選擇電子郵件帳號。"
 
-#: src/compose.c:2850 src/send_message.c:300
+#: src/compose.c:2858 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "向 %s 發出文章時出現錯誤。"
 
-#: src/compose.c:2892
+#: src/compose.c:2900
 msgid "Can't save the message to outbox."
 msgstr "無法將郵件送至寄件夾中。"
 
-#: src/compose.c:2930
+#: src/compose.c:2938
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "無法找到任何與目前選取之金鑰「%s」相關的金鑰。"
 
-#: src/compose.c:3027
+#: src/compose.c:3035
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1644,11 +1644,11 @@ msgstr ""
 "無法將郵件內文的編碼設定由 %s 轉換為 %s。\n"
 "仍舊要以 %s 傳送嗎？"
 
-#: src/compose.c:3033
+#: src/compose.c:3041
 msgid "Code conversion error"
 msgstr "轉換編碼時發生錯誤"
 
-#: src/compose.c:3112
+#: src/compose.c:3120
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1661,15 +1661,15 @@ msgstr ""
 "\n"
 "無論如何都要傳送嗎？"
 
-#: src/compose.c:3116
+#: src/compose.c:3124
 msgid "Line length limit"
 msgstr "列長度限制"
 
-#: src/compose.c:3245
+#: src/compose.c:3253
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3246
+#: src/compose.c:3254
 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 "
@@ -1678,83 +1678,83 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3429
+#: src/compose.c:3437
 msgid "can't remove the old message\n"
 msgstr "無法移除原有的舊郵件\n"
 
-#: src/compose.c:3447
+#: src/compose.c:3455
 msgid "queueing message...\n"
 msgstr "送進暫存資料夾中...\n"
 
-#: src/compose.c:3529
+#: src/compose.c:3537
 msgid "can't find queue folder\n"
 msgstr "找不到暫存資料夾\n"
 
-#: src/compose.c:3536
+#: src/compose.c:3544
 msgid "can't queue the message\n"
 msgstr "無法放進暫存資料夾\n"
 
-#: src/compose.c:4168
+#: src/compose.c:4176
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "產生郵件的編號：%s\n"
 
-#: src/compose.c:4283
+#: src/compose.c:4291
 msgid "Creating compose window...\n"
 msgstr "正在建立編寫視窗...\n"
 
-#: src/compose.c:4336 src/headerview.c:54
+#: src/compose.c:4344 src/headerview.c:54
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:4410
+#: src/compose.c:4418
 msgid "PGP Sign"
 msgstr "PGP 簽章"
 
-#: src/compose.c:4413
+#: src/compose.c:4421
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:4451 src/compose.c:5553
+#: src/compose.c:4459 src/compose.c:5561
 msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:4460 src/mimeview.c:199 src/prefs_filter_edit.c:497
+#: src/compose.c:4468 src/mimeview.c:199 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5021
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:5449
+#: src/compose.c:5457
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:5467
+#: src/compose.c:5475
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:5535
+#: src/compose.c:5543
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:5555 src/prefs_common_dialog.c:1504
+#: src/compose.c:5563 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:5578 src/prefs_folder_item.c:202
+#: src/compose.c:5586 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:5579
+#: src/compose.c:5587
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:5669
+#: src/compose.c:5677
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:5724
+#: src/compose.c:5732
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1764,48 +1764,48 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:6060 src/mainwindow.c:2799
+#: src/compose.c:6068 src/mainwindow.c:2811
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6176 src/compose.c:6181 src/compose.c:6187
+#: src/compose.c:6184 src/compose.c:6189 src/compose.c:6195
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:6278
+#: src/compose.c:6286
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:6301
+#: src/compose.c:6309
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:6336
+#: src/compose.c:6344
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:6337
+#: src/compose.c:6345
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:6339
+#: src/compose.c:6347
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:6381
+#: src/compose.c:6389
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:6383
+#: src/compose.c:6391
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6384
+#: src/compose.c:6392
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -1962,12 +1962,12 @@ msgstr "編輯資料夾"
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2182
-#: src/folderview.c:2188
+#: src/editgroup.c:546 src/foldersel.c:546 src/folderview.c:2190
+#: src/folderview.c:2196
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2189
+#: src/editgroup.c:547 src/foldersel.c:547 src/folderview.c:2197
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -2134,42 +2134,42 @@ msgstr "選擇目錄"
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: src/foldersel.c:362 src/folderview.c:1207 src/prefs_folder_item.c:235
+#: src/foldersel.c:362 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "收件夾"
 
-#: src/foldersel.c:366 src/folderview.c:1213 src/prefs_folder_item.c:236
+#: src/foldersel.c:366 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "寄件夾"
 
-#: src/foldersel.c:370 src/folderview.c:1219 src/prefs_folder_item.c:238
+#: src/foldersel.c:370 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "暫存資料夾"
 
-#: src/foldersel.c:374 src/folderview.c:1225 src/prefs_folder_item.c:239
+#: src/foldersel.c:374 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "刪除的郵件"
 
-#: src/foldersel.c:378 src/folderview.c:1231 src/prefs_folder_item.c:237
+#: src/foldersel.c:378 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:548 src/folderview.c:2186 src/folderview.c:2190
+#: src/foldersel.c:548 src/folderview.c:2194 src/folderview.c:2198
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:556 src/folderview.c:2198 src/folderview.c:2259
+#: src/foldersel.c:556 src/folderview.c:2206 src/folderview.c:2267
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "資料夾名稱中不應含有「%c」這個字元。"
 
-#: src/foldersel.c:566 src/folderview.c:2208 src/folderview.c:2267
+#: src/foldersel.c:566 src/folderview.c:2216 src/folderview.c:2275
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "資料夾「%s」已存在。"
 
-#: src/foldersel.c:574 src/folderview.c:2215
+#: src/foldersel.c:574 src/folderview.c:2223
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "無法建立資料夾「%s」。"
@@ -2258,56 +2258,56 @@ msgstr "設定資料夾...\n"
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:874 src/mainwindow.c:3797 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:3809 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:878 src/mainwindow.c:3802 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:3814 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/folderview.c:920
+#: src/folderview.c:928
 msgid "Rebuild folder tree"
 msgstr "重建資料夾結構"
 
-#: src/folderview.c:921
+#: src/folderview.c:929
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "準備重建資料夾。確定要繼續？"
 
-#: src/folderview.c:930
+#: src/folderview.c:938
 msgid "Rebuilding folder tree..."
 msgstr "重建資料夾結構中..."
 
-#: src/folderview.c:937
+#: src/folderview.c:945
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建資料夾結構失敗。"
 
-#: src/folderview.c:1071
+#: src/folderview.c:1079
 msgid "Checking for new messages in all folders..."
 msgstr "檢查每個資料夾中的新郵件..."
 
-#: src/folderview.c:1239 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
+#: src/folderview.c:1247 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: src/folderview.c:1911
+#: src/folderview.c:1919
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "已選取 %s 資料夾\n"
 
-#: src/folderview.c:2066
+#: src/folderview.c:2074
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "從 %s 下載郵件中..."
 
-#: src/folderview.c:2103
+#: src/folderview.c:2111
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "從 %s 下載郵件時出現錯誤。"
 
-#: src/folderview.c:2183
+#: src/folderview.c:2191
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2317,26 +2317,26 @@ msgstr ""
 "（若是資料夾下要有子資料夾，\n"
 "　請在資料夾名稱的後面加上「/'）"
 
-#: src/folderview.c:2247
+#: src/folderview.c:2255
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "請輸入「%s」的新名稱："
 
-#: src/folderview.c:2248
+#: src/folderview.c:2256
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
-#: src/folderview.c:2279 src/folderview.c:2287
+#: src/folderview.c:2287 src/folderview.c:2295
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2357
+#: src/folderview.c:2365
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "無法移動資料夾「%s」。"
 
-#: src/folderview.c:2423
+#: src/folderview.c:2431
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2345,12 +2345,12 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2425
+#: src/folderview.c:2433
 #, fuzzy
 msgid "Delete search folder"
 msgstr "刪除資料夾"
 
-#: src/folderview.c:2430
+#: src/folderview.c:2438
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2363,20 +2363,20 @@ msgstr ""
 "\n"
 "您確定要刪除它嗎？"
 
-#: src/folderview.c:2462 src/folderview.c:2468
+#: src/folderview.c:2470 src/folderview.c:2476
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2504
+#: src/folderview.c:2512
 msgid "Empty trash"
 msgstr "清空刪除的郵件"
 
-#: src/folderview.c:2505
+#: src/folderview.c:2513
 msgid "Delete all messages in the trash folder?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/folderview.c:2546
+#: src/folderview.c:2554
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2385,34 +2385,34 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2548
+#: src/folderview.c:2556
 msgid "Remove mailbox"
 msgstr "移除信箱"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2606
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "您確定要刪除 %s 這個 IMAP4 帳號？"
 
-#: src/folderview.c:2599
+#: src/folderview.c:2607
 msgid "Delete IMAP4 account"
 msgstr "刪除 IMAP4 帳號"
 
-#: src/folderview.c:2752
+#: src/folderview.c:2760
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "您確定要刪除新聞群組「%s」嗎？"
 
-#: src/folderview.c:2753
+#: src/folderview.c:2761
 msgid "Delete newsgroup"
 msgstr "刪除新聞群組"
 
-#: src/folderview.c:2803
+#: src/folderview.c:2811
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "您確定要刪除新聞群組帳號「%s」嗎？"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2812
 msgid "Delete news account"
 msgstr "刪除帳號"
 
@@ -2558,143 +2558,143 @@ msgstr "完成"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 封新郵件"
 
-#: src/inc.c:478
+#: src/inc.c:481
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "認證中..."
 
-#: src/inc.c:504
+#: src/inc.c:507
 msgid "Retrieving new messages"
 msgstr "取得新郵件中"
 
-#: src/inc.c:547
+#: src/inc.c:550
 msgid "Standby"
 msgstr "等待處理中"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:684 src/inc.c:733
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:692
+#: src/inc.c:695
 msgid "Retrieving"
 msgstr "讀取中"
 
-#: src/inc.c:701
+#: src/inc.c:704
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "完成 （已接收 %d 封郵件 (%s)）"
 
-#: src/inc.c:705
+#: src/inc.c:708
 msgid "Done (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:711
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr "連線失敗。"
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:717
+#: src/inc.c:720
 msgid "Locked"
 msgstr "已鎖定"
 
-#: src/inc.c:727
+#: src/inc.c:730
 msgid "Timeout"
 msgstr "逾時"
 
-#: src/inc.c:777
+#: src/inc.c:780
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成（%d 封新郵件）"
 
-#: src/inc.c:780
+#: src/inc.c:783
 msgid "Finished (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:789
+#: src/inc.c:792
 msgid "Some errors occurred while getting mail."
 msgstr "取得郵件時發生錯誤。"
 
-#: src/inc.c:825
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "取得 %s 的新郵件中, 請稍候...\n"
 
-#: src/inc.c:829
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "認證中..."
 
-#: src/inc.c:832
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 取得新郵件中, 請稍候..."
 
-#: src/inc.c:851
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "連線到 POP3 伺服器 %s 中..."
 
-#: src/inc.c:862
+#: src/inc.c:865
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/inc.c:941 src/send_message.c:649
+#: src/inc.c:944 src/send_message.c:649
 msgid "Authenticating..."
 msgstr "認證"
 
-#: src/inc.c:942
+#: src/inc.c:945
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/inc.c:947
+#: src/inc.c:950
 msgid "Getting the number of new messages (STAT)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:951
+#: src/inc.c:954
 msgid "Getting the number of new messages (LAST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:955
+#: src/inc.c:958
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:959
+#: src/inc.c:962
 msgid "Getting the size of messages (LIST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:969
+#: src/inc.c:972
 #, c-format
 msgid "Deleting message %d"
 msgstr "刪除第 %d 號郵件"
 
-#: src/inc.c:976 src/send_message.c:667
+#: src/inc.c:979 src/send_message.c:667
 msgid "Quitting"
 msgstr "離開"
 
-#: src/inc.c:1001
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "取得新郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "取得新郵件 (共 %d 封新郵件, %s 已接收）"
 
-#: src/inc.c:1267
+#: src/inc.c:1270
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: src/inc.c:1273
+#: src/inc.c:1276
 msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/inc.c:1278
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2703,39 +2703,39 @@ msgstr ""
 "處理郵件時發生錯誤：\n"
 "%s"
 
-#: src/inc.c:1284
+#: src/inc.c:1287
 msgid "No disk space left."
 msgstr "磁碟空間已滿。"
 
-#: src/inc.c:1289
+#: src/inc.c:1292
 msgid "Can't write file."
 msgstr "無法寫入檔案。"
 
-#: src/inc.c:1294
+#: src/inc.c:1297
 msgid "Socket error."
 msgstr "Socket 有錯誤"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1300 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1303 src/send_message.c:601 src/send_message.c:793
 msgid "Connection closed by the remote host."
 msgstr "遠端主機關閉連線。"
 
-#: src/inc.c:1306
+#: src/inc.c:1309
 msgid "Mailbox is locked."
 msgstr "信箱已被鎖定，可能前一次擷取未完成。"
 
-#: src/inc.c:1310
+#: src/inc.c:1313
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "信箱已被鎖定：%s"
 
-#: src/inc.c:1316 src/send_message.c:778
+#: src/inc.c:1319 src/send_message.c:778
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1321 src/send_message.c:781
+#: src/inc.c:1324 src/send_message.c:781
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2744,15 +2744,15 @@ msgstr ""
 "認證失敗：\n"
 "%s"
 
-#: src/inc.c:1326 src/send_message.c:797
+#: src/inc.c:1329 src/send_message.c:797
 msgid "Session timed out."
 msgstr "作業逾時"
 
-#: src/inc.c:1362
+#: src/inc.c:1365
 msgid "Incorporation cancelled\n"
 msgstr "動作已取消\n"
 
-#: src/inc.c:1445
+#: src/inc.c:1448
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "從 %s 中取得郵件放入 %s...\n"
@@ -2877,7 +2877,7 @@ msgstr "有未送出郵件"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "有些郵件正在暫存資料夾中尚未送出。確定要離開嗎？"
 
-#: src/main.c:753
+#: src/main.c:755
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2886,15 +2886,15 @@ msgstr ""
 "關閉 OpenPGP 支援項目。"
 
 #. remote command mode
-#: src/main.c:916
+#: src/main.c:918
 msgid "another Sylpheed is already running.\n"
 msgstr "已經有 Sylpheed 程式正在執行中。\n"
 
-#: src/main.c:1160
+#: src/main.c:1168
 msgid "Migration of configuration"
 msgstr "設定資料轉移"
 
-#: src/main.c:1161
+#: src/main.c:1169
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -2902,660 +2902,661 @@ msgstr ""
 "找到之前版本的設定檔。\n"
 "您要轉換它嗎？"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:518
 msgid "/_File/_Folder"
 msgstr "/檔案(_F)/資料夾管理(_F)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:519
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/新增資料夾(_N)"
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:521
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/重新命名資料夾(_R)"
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:522
 msgid "/_File/_Folder/_Move folder..."
 msgstr "/檔案(_F)/資料夾管理(_F)/移動資料夾(_M)"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:523
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/檔案(_F)/資料夾管理(_F)/刪除資料夾(_D)"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:524
 msgid "/_File/_Mailbox"
 msgstr "/檔案(_F)/信箱(_M)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:525
 msgid "/_File/_Mailbox/Add _mailbox..."
 msgstr "/檔案(_F)/信箱(_M)/新增信箱(_M)..."
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:526
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/檔案(_F)/信箱(_M)/移除信箱(_R)"
 
-#: src/mainwindow.c:525 src/mainwindow.c:530
+#: src/mainwindow.c:527 src/mainwindow.c:532
 msgid "/_File/_Mailbox/---"
 msgstr "/檔案(_F)/信箱(_M)/---"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:528
 msgid "/_File/_Mailbox/_Check for new messages"
 msgstr "/檔案(_F)/信箱(_M)/檢查新郵件(_C)"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:530
 msgid "/_File/_Mailbox/Check for new messages in _all mailboxes"
 msgstr "/檔案(_F)/信箱(_M)/檢查所有信箱中的新郵件(_A)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:533
 msgid "/_File/_Mailbox/R_ebuild folder tree"
 msgstr "/檔案(_F)/信箱(_M)/重建資料夾結構(_E)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:536
 msgid "/_File/_Import mbox file..."
 msgstr "/檔案(_F)/匯入郵件(_I)"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:537
 msgid "/_File/_Export to mbox file..."
 msgstr "/檔案(_F)/匯出資料夾(_E)"
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:539
 msgid "/_File/Empty all _trash"
 msgstr "/檔案(_F)/清空刪除的郵件(_T)"
 
-#: src/mainwindow.c:539 src/messageview.c:150
+#: src/mainwindow.c:541 src/messageview.c:150
 msgid "/_File/_Save as..."
 msgstr "/檔案(_F)/另存新檔(_S)..."
 
-#: src/mainwindow.c:542 src/messageview.c:153
+#: src/mainwindow.c:544 src/messageview.c:153
 #, fuzzy
 msgid "/_File/Page set_up..."
 msgstr "/檔案(_F)/另存新檔(_S)..."
 
-#: src/mainwindow.c:544 src/messageview.c:155
+#: src/mainwindow.c:546 src/messageview.c:155
 msgid "/_File/_Print..."
 msgstr "/檔案(_F)/列印(_P)..."
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:548
 msgid "/_File/_Work offline"
 msgstr "/檔案(_F)/離線工作(_W)"
 
 #. {N_("/_File/_Close"),		"<alt>W", app_exit_cb, 0, NULL},
-#: src/mainwindow.c:549
+#: src/mainwindow.c:551
 msgid "/_File/E_xit"
 msgstr "/檔案(_F)/離開(_X)"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:556
 msgid "/_Edit/Select _thread"
 msgstr "/編輯(_E)/選取串列(_T)"
 
-#: src/mainwindow.c:556 src/messageview.c:163
+#: src/mainwindow.c:558 src/messageview.c:163
 msgid "/_Edit/_Find in current message..."
 msgstr "/編輯(_E)/在目前郵件中尋找(_F)"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:560
 msgid "/_Edit/_Search messages..."
 msgstr "/編輯(_E)/尋找郵件(_S)"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:563
 msgid "/_View/Show or hi_de"
 msgstr "/顯示(_V)/顯示或隱藏(_D)"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:564
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/資料夾列表(_F)"
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:566
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/郵件預覽(_M)"
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:568
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)"
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/圖樣與文字(_A)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 #, fuzzy
 msgid "/_View/Show or hi_de/_Toolbar/Text at the _right of icon"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/圖樣(_I)"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/圖樣(_I)"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:576
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/文字(_T)"
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:578
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/工具列(_T)/不顯示(_N)"
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:580
 #, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/狀態列(_B)"
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:582
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/顯示(_V)/顯示或隱藏(_D)/狀態列(_B)"
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:584
 #, fuzzy
 msgid "/_View/_Customize toolbar..."
 msgstr "/顯示(_V)/前往(_G)/到其他資料夾(_F)"
 
-#: src/mainwindow.c:584
+#: src/mainwindow.c:586
 msgid "/_View/Separate f_older tree"
 msgstr "/顯示(_V)/將資料夾列表分離(_O)"
 
-#: src/mainwindow.c:585
+#: src/mainwindow.c:587
 msgid "/_View/Separate _message view"
 msgstr "/顯示(_V)/將郵件預覽分離(_M)"
 
-#: src/mainwindow.c:587
+#: src/mainwindow.c:589
 msgid "/_View/_Sort"
 msgstr "/顯示(_V)/排序(_S)"
 
-#: src/mainwindow.c:588
+#: src/mainwindow.c:590
 msgid "/_View/_Sort/by _number"
 msgstr "/顯示(_V)/排序(_S)/用編號排序(_N)"
 
-#: src/mainwindow.c:589
+#: src/mainwindow.c:591
 msgid "/_View/_Sort/by s_ize"
 msgstr "/顯示(_V)/排序(_S)/用大小排序(_I)"
 
-#: src/mainwindow.c:590
+#: src/mainwindow.c:592
 msgid "/_View/_Sort/by _date"
 msgstr "/顯示(_V)/排序(_S)/用日期排序(_D)"
 
-#: src/mainwindow.c:591
+#: src/mainwindow.c:593
 msgid "/_View/_Sort/by t_hread date"
 msgstr "/顯示(_V)/排序(_S)/用串列日期排序(_H)"
 
-#: src/mainwindow.c:592
+#: src/mainwindow.c:594
 msgid "/_View/_Sort/by _from"
 msgstr "/顯示(_V)/排序(_S)/用來源排序(_F)"
 
-#: src/mainwindow.c:593
+#: src/mainwindow.c:595
 msgid "/_View/_Sort/by _recipient"
 msgstr "/顯示(_V)/排序(_S)/用收件人排序(_R)"
 
-#: src/mainwindow.c:594
+#: src/mainwindow.c:596
 msgid "/_View/_Sort/by _subject"
 msgstr "/顯示(_V)/排序(_S)/用主旨排序(_S)"
 
-#: src/mainwindow.c:595
+#: src/mainwindow.c:597
 msgid "/_View/_Sort/by _color label"
 msgstr "/顯示(_V)/排序(_S)/用標記顏色排序(_C)"
 
-#: src/mainwindow.c:597
+#: src/mainwindow.c:599
 msgid "/_View/_Sort/by _mark"
 msgstr "/顯示(_V)/排序(_S)/用標記排序(_M)"
 
-#: src/mainwindow.c:598
+#: src/mainwindow.c:600
 msgid "/_View/_Sort/by _unread"
 msgstr "/顯示(_V)/排序(_S)/依已讀或未讀排序(_U)"
 
-#: src/mainwindow.c:599
+#: src/mainwindow.c:601
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/顯示(_V)/排序(_S)/用附加檔排序(_T)"
 
-#: src/mainwindow.c:601
+#: src/mainwindow.c:603
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/顯示(_V)/排序(_S)/不排序(_O)"
 
-#: src/mainwindow.c:602 src/mainwindow.c:605
+#: src/mainwindow.c:604 src/mainwindow.c:607
 msgid "/_View/_Sort/---"
 msgstr "/顯示(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:603
+#: src/mainwindow.c:605
 msgid "/_View/_Sort/Ascending"
 msgstr "/顯示(_V)/排序(_S)/遞增排序"
 
-#: src/mainwindow.c:604
+#: src/mainwindow.c:606
 msgid "/_View/_Sort/Descending"
 msgstr "/顯示(_V)/排序(_S)/遞減排序"
 
-#: src/mainwindow.c:606
+#: src/mainwindow.c:608
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/顯示(_V)/排序(_S)/用郵件串列排序(_A)"
 
-#: src/mainwindow.c:608
+#: src/mainwindow.c:610
 msgid "/_View/Th_read view"
 msgstr "/顯示(_V)/將郵件串列顯示(_R)"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:611
 msgid "/_View/E_xpand all threads"
 msgstr "/顯示(_V)/展開所有郵件串列(_X)"
 
-#: src/mainwindow.c:610
+#: src/mainwindow.c:612
 msgid "/_View/Co_llapse all threads"
 msgstr "/顯示(_V)/解除所有郵件串列(_L)"
 
-#: src/mainwindow.c:611
+#: src/mainwindow.c:613
 msgid "/_View/Set display _item..."
 msgstr "/顯示(_V)/設定顯示的項目(_I)..."
 
-#: src/mainwindow.c:614
+#: src/mainwindow.c:616
 msgid "/_View/_Go to"
 msgstr "/顯示(_V)/前往(_G)"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:617
 msgid "/_View/_Go to/_Prev message"
 msgstr "/顯示(_V)/前往(_G)/前一封郵件(_P)"
 
-#: src/mainwindow.c:616
+#: src/mainwindow.c:618
 msgid "/_View/_Go to/_Next message"
 msgstr "/顯示(_V)/前往(_G)/下一封郵件(_N)"
 
-#: src/mainwindow.c:617 src/mainwindow.c:622 src/mainwindow.c:625
-#: src/mainwindow.c:630 src/mainwindow.c:635
+#: src/mainwindow.c:619 src/mainwindow.c:624 src/mainwindow.c:627
+#: src/mainwindow.c:632 src/mainwindow.c:637
 msgid "/_View/_Go to/---"
 msgstr "/顯示(_V)/前往(_G)/---"
 
-#: src/mainwindow.c:618
+#: src/mainwindow.c:620
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/顯示(_V)/前往(_G)/前一封未讀郵件(_R)"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:622
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/顯示(_V)/前往(_G)/下一封未讀郵件(_E)"
 
-#: src/mainwindow.c:623
+#: src/mainwindow.c:625
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/顯示(_V)/前往(_G)/前一封新郵件(_W)"
 
-#: src/mainwindow.c:624
+#: src/mainwindow.c:626
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/顯示(_V)/前往(_G)/下一封新郵件(_X)"
 
-#: src/mainwindow.c:626
+#: src/mainwindow.c:628
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/顯示(_V)/前往(_G)/前一封已標記郵件(_M)"
 
-#: src/mainwindow.c:628
+#: src/mainwindow.c:630
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/顯示(_V)/前往(_G)/下一封已標記郵件(_A)"
 
-#: src/mainwindow.c:631
+#: src/mainwindow.c:633
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/顯示(_V)/前往(_G)/前一封已標記顏色之郵件(_L)"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:635
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/顯示(_V)/前往(_G)/下一封已標記顏色之郵件(_B)"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:638
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/顯示(_V)/前往(_G)/到其他資料夾(_F)"
 
-#: src/mainwindow.c:645 src/messageview.c:174
+#: src/mainwindow.c:647 src/messageview.c:174
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/顯示(_V)/字元編碼(_E)/自動偵測(_A)"
 
-#: src/mainwindow.c:658 src/messageview.c:187
+#: src/mainwindow.c:660 src/messageview.c:187
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/顯示(_V)/字元編碼(_E)/西歐語系 (ISO-8859-15)"
 
-#: src/mainwindow.c:706 src/messageview.c:227
+#: src/mainwindow.c:708 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:708 src/messageview.c:229
+#: src/mainwindow.c:710 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (_EUC-JP)"
 
-#: src/mainwindow.c:710 src/messageview.c:231
+#: src/mainwindow.c:712 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/顯示(_V)/字元編碼(_E)/日文 (_Shift__JIS)"
 
-#: src/mainwindow.c:720 src/messageview.c:240
+#: src/mainwindow.c:722 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/顯示(_V)/字元編碼(_E)/繁體中文 (EUC-_TW)"
 
-#: src/mainwindow.c:722 src/messageview.c:242
+#: src/mainwindow.c:724 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/顯示(_V)/字元編碼(_E)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:728 src/messageview.c:247
+#: src/mainwindow.c:730 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/顯示(_V)/字元編碼(_E)/韓文 (ISO-2022-KR)"
 
-#: src/mainwindow.c:741 src/summaryview.c:464
+#: src/mainwindow.c:743 src/summaryview.c:464
 msgid "/_View/Open in new _window"
 msgstr "/顯示(_V)/在新視窗開啟(_W)"
 
-#: src/mainwindow.c:742 src/messageview.c:259 src/summaryview.c:466
+#: src/mainwindow.c:744 src/messageview.c:259 src/summaryview.c:466
 msgid "/_View/Mess_age source"
 msgstr "/顯示(_V)/觀看郵件原始碼(_A)"
 
-#: src/mainwindow.c:743 src/messageview.c:260 src/summaryview.c:467
+#: src/mainwindow.c:745 src/messageview.c:260 src/summaryview.c:467
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/顯示(_V)/顯示所有的標頭(_H)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:747
 msgid "/_View/_Update summary"
 msgstr "/顯示(_V)/更新郵件列表(_U)"
 
-#: src/mainwindow.c:747 src/messageview.c:263
+#: src/mainwindow.c:749 src/messageview.c:263
 msgid "/_Message"
 msgstr "/郵件(_M)"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:750
 msgid "/_Message/Recei_ve"
 msgstr "/郵件(_M)/接收(_V)"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:751
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/郵件(_M)/接收(_V)/從目前帳號中接收新郵件(_C)"
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:753
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/郵件(_M)/接收(_V)/從所有帳號中接收新郵件(_A)"
 
-#: src/mainwindow.c:753
-msgid "/_Message/Recei_ve/Cancel receivin_g"
+#: src/mainwindow.c:755
+#, fuzzy
+msgid "/_Message/Recei_ve/Stop receivin_g"
 msgstr "/郵件(_M)/接收(_V)/取消接收(_G)"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:757
 msgid "/_Message/Recei_ve/---"
 msgstr "/郵件(_M)/接收(_V)/---"
 
-#: src/mainwindow.c:756
+#: src/mainwindow.c:758
 msgid "/_Message/_Send queued messages"
 msgstr "/郵件(_M)/將暫存資料夾中的郵件送出(_S)"
 
-#: src/mainwindow.c:757 src/mainwindow.c:759 src/mainwindow.c:766
-#: src/mainwindow.c:771 src/mainwindow.c:774 src/mainwindow.c:785
-#: src/mainwindow.c:787 src/mainwindow.c:790 src/messageview.c:266
+#: src/mainwindow.c:759 src/mainwindow.c:761 src/mainwindow.c:768
+#: src/mainwindow.c:773 src/mainwindow.c:776 src/mainwindow.c:787
+#: src/mainwindow.c:789 src/mainwindow.c:792 src/messageview.c:266
 #: src/messageview.c:274 src/messageview.c:279
 msgid "/_Message/---"
 msgstr "/郵件(_M)/---"
 
-#: src/mainwindow.c:758 src/messageview.c:264
+#: src/mainwindow.c:760 src/messageview.c:264
 msgid "/_Message/Compose _new message"
 msgstr "/郵件(_M)/撰寫郵件(_N)"
 
-#: src/mainwindow.c:760 src/messageview.c:267
+#: src/mainwindow.c:762 src/messageview.c:267
 msgid "/_Message/_Reply"
 msgstr "/郵件(_M)/直接回覆(_R)"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:763
 msgid "/_Message/Repl_y to"
 msgstr "/郵件(_M)/回覆給(_Y)"
 
-#: src/mainwindow.c:762 src/messageview.c:268
+#: src/mainwindow.c:764 src/messageview.c:268
 msgid "/_Message/Repl_y to/_all"
 msgstr "/郵件(_M)/回覆給(_Y)/所有收件人(_A)"
 
-#: src/mainwindow.c:763 src/messageview.c:270
+#: src/mainwindow.c:765 src/messageview.c:270
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/郵件(_M)/回覆給(_Y)/原作者(_S)"
 
-#: src/mainwindow.c:764 src/messageview.c:272
+#: src/mainwindow.c:766 src/messageview.c:272
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/郵件(_M)/回覆給(_Y)/郵遞論壇(_L)"
 
-#: src/mainwindow.c:767 src/messageview.c:275
+#: src/mainwindow.c:769 src/messageview.c:275
 msgid "/_Message/_Forward"
 msgstr "/郵件(_M)/轉寄(_F)"
 
-#: src/mainwindow.c:768 src/messageview.c:276
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Message/For_ward as attachment"
 msgstr "/郵件(_M)/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:770 src/messageview.c:278
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Message/Redirec_t"
 msgstr "/郵件(_M)/郵件導向(_T)"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:774
 msgid "/_Message/M_ove..."
 msgstr "/郵件(_M)/移動(_O)..."
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:775
 msgid "/_Message/_Copy..."
 msgstr "/郵件(_M)/複製(_C)..."
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:777
 msgid "/_Message/_Mark"
 msgstr "/郵件(_M)/標記(_M)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:778
 msgid "/_Message/_Mark/_Mark"
 msgstr "/郵件(_M)/標記(_M)/標記(_M)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:779
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/郵件(_M)/標記(_M)/去除標記(_U)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "/_Message/_Mark/---"
 msgstr "/郵件(_M)/標記(_M)/---"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:781
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/郵件(_M)/標記(_M)/標記成未讀(_E)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:782
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/郵件(_M)/標記(_M)/標記成已讀(_D)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:784
 #, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
 msgstr "/郵件(_M)/標記(_M)/標記成已讀(_D)"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:786
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/郵件(_M)/標記(_M)/標記所有郵件成已讀(_D)"
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:788
 msgid "/_Message/_Delete"
 msgstr "/郵件(_M)/刪除(_D)"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:790
 msgid "/_Message/Set as _junk mail"
 msgstr "/郵件(_M)/歸類為垃圾郵件(_J)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:791
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/郵件(_M)/歸類為非垃圾郵件(_U)"
 
-#: src/mainwindow.c:791 src/messageview.c:280
+#: src/mainwindow.c:793 src/messageview.c:280
 msgid "/_Message/Re-_edit"
 msgstr "/郵件(_M)/重新編輯(_E)"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:797
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/工具(_T)/將寄信人加入通訊錄(_K)..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:800
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/過濾資料夾中所有郵件(_F)"
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:802
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/過濾選擇的郵件(_F)"
 
-#: src/mainwindow.c:802 src/messageview.c:287
+#: src/mainwindow.c:804 src/messageview.c:287
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)"
 
-#: src/mainwindow.c:803 src/messageview.c:289
+#: src/mainwindow.c:805 src/messageview.c:289
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/自動產生"
 
-#: src/mainwindow.c:805 src/messageview.c:291
+#: src/mainwindow.c:807 src/messageview.c:291
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依來源(_F)"
 
-#: src/mainwindow.c:807 src/messageview.c:293
+#: src/mainwindow.c:809 src/messageview.c:293
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依收信人(_T)"
 
-#: src/mainwindow.c:809 src/messageview.c:295
+#: src/mainwindow.c:811 src/messageview.c:295
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/產生郵件過濾規則(_C)/依主旨(_S)"
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:814
 msgid "/_Tools/Filter _junk mails in folder"
 msgstr "/工具(_T)/過濾資料夾中所有垃圾郵件(_J)"
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:816
 msgid "/_Tools/Filter junk _mails in selected messages"
 msgstr "/工具(_T)/過濾選擇的郵件中所有垃圾郵件(_M)"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:823
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/刪除重覆的郵件(_P)"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:826
 #, fuzzy
 msgid "/_Tools/E_xecute marked process"
 msgstr "執行標記的行程"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:828
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/紀錄視窗(_L)"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:830
 msgid "/_Configuration"
 msgstr "/設定(_C)"
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Common preferences..."
 msgstr "/設定(_C)/一般設定(_C)..."
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:833
 msgid "/_Configuration/_Filter setting..."
 msgstr "/設定(_C)/郵件過濾設定(_F)..."
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:835
 msgid "/_Configuration/_Template..."
 msgstr "/設定(_C)/郵件樣板設定(_T)..."
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:837
 msgid "/_Configuration/_Actions..."
 msgstr "/設定(_C)/外部指令設定(_A)..."
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:839
 msgid "/_Configuration/---"
 msgstr "/設定(_C)/---"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:840
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/設定(_C)/目前帳號設定(_P)..."
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:842
 msgid "/_Configuration/Create _new account..."
 msgstr "/設定(_C)/新增帳號(_N)..."
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:844
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/設定(_C)/編輯帳號(_E)..."
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:846
 msgid "/_Configuration/C_hange current account"
 msgstr "/設定(_C)/改變現有帳號(_H)"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:850
 msgid "/_Help/_Manual"
 msgstr "/說明(_H)/說明文件(_M)"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:851
 msgid "/_Help/_Manual/_English"
 msgstr "/說明(_H)/說明文件(_M)/英文(_E)"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:852
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/說明(_H)/說明文件(_M)/日文(_J)"
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:853
 msgid "/_Help/_FAQ"
 msgstr "/說明(_H)/常問問題解答(_F)"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:854
 msgid "/_Help/_FAQ/_English"
 msgstr "/說明(_H)/常問問題解答(_F)/英文(_E)"
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:855
 msgid "/_Help/_FAQ/_German"
 msgstr "/說明(_H)/常問問題解答(_F)/德文(_G)"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:856
 msgid "/_Help/_FAQ/_Spanish"
 msgstr "/說明(_H)/常問問題解答(_F)/西班牙文(_S)"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:857
 msgid "/_Help/_FAQ/_French"
 msgstr "/說明(_H)/常問問題解答(_F)/法文(_F)"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:858
 msgid "/_Help/_FAQ/_Italian"
 msgstr "/說明(_H)/常問問題解答(_F)/義大利文(_I)"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:859
 #, fuzzy
 msgid "/_Help/_Command line options"
 msgstr "未設定執行指令"
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:860
 msgid "/_Help/---"
 msgstr "/說明(_H)/---"
 
-#: src/mainwindow.c:901
+#: src/mainwindow.c:903
 msgid "Creating main window...\n"
 msgstr "建立主視窗...\n"
 
-#: src/mainwindow.c:1077
+#: src/mainwindow.c:1079
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1185 src/summaryview.c:2387 src/summaryview.c:2472
+#: src/mainwindow.c:1187 src/summaryview.c:2387 src/summaryview.c:2472
 #: src/summaryview.c:4009 src/summaryview.c:4138 src/summaryview.c:4507
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/mainwindow.c:1303 src/mainwindow.c:1344 src/mainwindow.c:1369
+#: src/mainwindow.c:1305 src/mainwindow.c:1346 src/mainwindow.c:1371
 msgid "Untitled"
 msgstr "無標題"
 
-#: src/mainwindow.c:1370
+#: src/mainwindow.c:1372
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:1423
+#: src/mainwindow.c:1425
 #, c-format
 msgid "Changing window separation type from %d to %d\n"
 msgstr "正在變更視窗分割類型由 %d 到 %d\n"
 
-#: src/mainwindow.c:1676
+#: src/mainwindow.c:1678
 msgid "Offline"
 msgstr "離線"
 
-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679
 msgid "You are offline. Go online?"
 msgstr "您目前正離線中。要連線嗎？"
 
-#: src/mainwindow.c:1694
+#: src/mainwindow.c:1696
 msgid "Empty all trash"
 msgstr "清空刪除的郵件"
 
-#: src/mainwindow.c:1695
+#: src/mainwindow.c:1697
 msgid "Delete all messages in trash folders?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/mainwindow.c:1725
+#: src/mainwindow.c:1727
 msgid "Add mailbox"
 msgstr "新增信箱"
 
-#: src/mainwindow.c:1726
+#: src/mainwindow.c:1728
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3565,16 +3566,16 @@ msgstr ""
 "並請注意不要輸入已存在的信箱名稱，\n"
 "系統會自動判別是否它已存在。"
 
-#: src/mainwindow.c:1732 src/setup.c:49
+#: src/mainwindow.c:1734 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "信箱「%s」已存在。"
 
-#: src/mainwindow.c:1737 src/setup.c:56
+#: src/mainwindow.c:1739 src/setup.c:56
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1743 src/setup.c:62
+#: src/mainwindow.c:1745 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -3583,69 +3584,69 @@ msgstr ""
 "無法產生信箱目錄。\n"
 "可能是因為同樣名稱的檔案已經存在，或者是你沒有權限可以開新目錄。"
 
-#: src/mainwindow.c:2232
+#: src/mainwindow.c:2235
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - 資料夾檢視"
 
-#: src/mainwindow.c:2251
+#: src/mainwindow.c:2254
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 郵件列表"
 
-#: src/mainwindow.c:2403 src/summaryview.c:418
+#: src/mainwindow.c:2406 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
-#: src/mainwindow.c:2404
+#: src/mainwindow.c:2407
 msgid "/Reply to _all"
 msgstr "/全部回覆(_A)"
 
-#: src/mainwindow.c:2405
+#: src/mainwindow.c:2408
 msgid "/Reply to _sender"
 msgstr "/回覆給原作者(_S)"
 
-#: src/mainwindow.c:2406
+#: src/mainwindow.c:2409
 msgid "/Reply to mailing _list"
 msgstr "/回覆到郵遞論壇(_L)"
 
-#: src/mainwindow.c:2411 src/summaryview.c:425
+#: src/mainwindow.c:2414 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2412 src/summaryview.c:426
+#: src/mainwindow.c:2415 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:2413 src/summaryview.c:427
+#: src/mainwindow.c:2416 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/郵件導向(_T)"
 
-#: src/mainwindow.c:2826
+#: src/mainwindow.c:2838
 msgid "You are offline. Click the icon to go online."
 msgstr "您目前正離線中。按下按鈕恢復連線。"
 
-#: src/mainwindow.c:2837
+#: src/mainwindow.c:2849
 msgid "You are online. Click the icon to go offline."
 msgstr "您目前正連線中。按下按鈕離線工作。"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:3111
+#: src/mainwindow.c:3123
 msgid "Exit this program?"
 msgstr "您確定要離開嗎？"
 
-#: src/mainwindow.c:3715
+#: src/mainwindow.c:3727
 #, fuzzy
 msgid "Command line options"
 msgstr "未設定執行指令"
 
-#: src/mainwindow.c:3728
+#: src/mainwindow.c:3740
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法：%s [選項]...\n"
 
-#: src/mainwindow.c:3736
+#: src/mainwindow.c:3748
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3661,7 +3662,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3752
+#: src/mainwindow.c:3764
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3882,7 +3883,7 @@ msgstr "帳號 %d"
 msgid "Preferences for new account"
 msgstr "新帳號設定"
 
-#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:91
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:94
 msgid "Account preferences"
 msgstr "帳號設定"
 
@@ -3895,7 +3896,7 @@ msgid "Receive"
 msgstr "接收設定"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:94
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:97
 msgid "Send"
 msgstr "送出"
 
@@ -4109,7 +4110,7 @@ msgstr "送信前先做 POP3 認證"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:109
+#: src/prefs_toolbar.c:112
 msgid "Signature"
 msgstr "簽章"
 
@@ -4564,7 +4565,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:112
+#: src/prefs_toolbar.c:115
 msgid "Editor"
 msgstr "編輯器"
 
@@ -5678,7 +5679,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "回覆時刪除郵件主旨前面的中括號 [] 或小括號 ()"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:90 src/progressdialog.c:128
+#: src/prefs_toolbar.c:93 src/progressdialog.c:128
 msgid "Account"
 msgstr "帳號"
 
@@ -5893,81 +5894,91 @@ msgstr "列印"
 msgid "Print message"
 msgstr "送出郵件"
 
-#: src/prefs_toolbar.c:84
+#: src/prefs_toolbar.c:81
+#, fuzzy
+msgid "Stop"
+msgstr "每次捲動"
+
+#: src/prefs_toolbar.c:82
+#, fuzzy
+msgid "Stop receiving"
+msgstr "接收郵件伺服器"
+
+#: src/prefs_toolbar.c:87
 msgid "Execute"
 msgstr "執行"
 
-#: src/prefs_toolbar.c:85
+#: src/prefs_toolbar.c:88
 msgid "Execute marked process"
 msgstr "執行標記的行程"
 
-#: src/prefs_toolbar.c:87
+#: src/prefs_toolbar.c:90
 msgid "Prefs"
 msgstr "設定"
 
-#: src/prefs_toolbar.c:88
+#: src/prefs_toolbar.c:91
 msgid "Common preferences"
 msgstr "一般設定"
 
-#: src/prefs_toolbar.c:95
+#: src/prefs_toolbar.c:98
 msgid "Send message"
 msgstr "送出郵件"
 
-#: src/prefs_toolbar.c:97
+#: src/prefs_toolbar.c:100
 msgid "Send later"
 msgstr "稍後再送出"
 
-#: src/prefs_toolbar.c:98
+#: src/prefs_toolbar.c:101
 msgid "Put into queue folder and send later"
 msgstr "放到寄件夾中稍後再送出"
 
-#: src/prefs_toolbar.c:100
+#: src/prefs_toolbar.c:103
 msgid "Draft"
 msgstr "草稿"
 
-#: src/prefs_toolbar.c:101
+#: src/prefs_toolbar.c:104
 msgid "Save to draft folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/prefs_toolbar.c:103
+#: src/prefs_toolbar.c:106
 msgid "Insert"
 msgstr "插入"
 
-#: src/prefs_toolbar.c:104
+#: src/prefs_toolbar.c:107
 msgid "Insert file"
 msgstr "插入檔案"
 
-#: src/prefs_toolbar.c:106
+#: src/prefs_toolbar.c:109
 msgid "Attach"
 msgstr "附加"
 
-#: src/prefs_toolbar.c:107
+#: src/prefs_toolbar.c:110
 msgid "Attach file"
 msgstr "附加檔案"
 
-#: src/prefs_toolbar.c:110
+#: src/prefs_toolbar.c:113
 #, fuzzy
 msgid "Append signature"
 msgstr "簽章檢查錯誤"
 
-#: src/prefs_toolbar.c:113
+#: src/prefs_toolbar.c:116
 msgid "Edit with external editor"
 msgstr "使用其他的編輯器"
 
-#: src/prefs_toolbar.c:119
+#: src/prefs_toolbar.c:122
 msgid "Linewrap"
 msgstr "折列"
 
-#: src/prefs_toolbar.c:120
+#: src/prefs_toolbar.c:123
 msgid "Wrap all long lines"
 msgstr "折換所有過長的文字列"
 
-#: src/prefs_toolbar.c:217
+#: src/prefs_toolbar.c:221
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/顯示(_V)/前往(_G)/到其他資料夾(_F)"
 
-#: src/prefs_toolbar.c:219
+#: src/prefs_toolbar.c:223
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"
@@ -6223,7 +6234,7 @@ msgstr "未發現簽章"
 msgid "Good signature from \"%s\""
 msgstr "來自\"%s\" 的簽章檢查正確"
 
-#: src/sigstatus.c:240 src/textview.c:764
+#: src/sigstatus.c:240 src/textview.c:776
 msgid "Good signature"
 msgstr "簽章檢查正確"
 
@@ -6232,7 +6243,7 @@ msgstr "簽章檢查正確"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "此簽章是有效的，不過 \"%s\" 的金鑰不可信。"
 
-#: src/sigstatus.c:245 src/textview.c:766
+#: src/sigstatus.c:245 src/textview.c:778
 msgid "Valid signature (untrusted key)"
 msgstr "簽章有效 (不可信的金鑰)"
 
@@ -6268,7 +6279,7 @@ msgstr "此簽章是有效的，不過 \"%s\" 的金鑰已撤消"
 msgid "BAD signature from \"%s\""
 msgstr "來自 \"%s\" 的簽章檢查錯誤"
 
-#: src/sigstatus.c:263 src/textview.c:768
+#: src/sigstatus.c:263 src/textview.c:780
 msgid "BAD signature"
 msgstr "簽章檢查錯誤"
 
@@ -6720,41 +6731,45 @@ msgstr "檔案 %s 已存在。\n"
 msgid "Creating text view...\n"
 msgstr "產生文字視窗...\n"
 
-#: src/textview.c:820
+#: src/textview.c:498
+msgid "This message is encrypted, but its decryption failed.\n"
+msgstr ""
+
+#: src/textview.c:832
 msgid "This message can't be displayed.\n"
 msgstr "無法顯示郵件。\n"
 
-#: src/textview.c:844
+#: src/textview.c:856
 msgid ""
 "The body text couldn't be displayed because writing to temporary file "
 "failed.\n"
 msgstr ""
 
-#: src/textview.c:1986
+#: src/textview.c:1998
 msgid "Sa_ve this image as..."
 msgstr "圖片另存新檔(_V)..."
 
-#: src/textview.c:2002 src/trayicon.c:158
+#: src/textview.c:2014 src/trayicon.c:158
 msgid "Compose _new message"
 msgstr "編寫新郵件(_N)"
 
-#: src/textview.c:2004
+#: src/textview.c:2016
 msgid "Add to address _book..."
 msgstr "將寄信人加入通訊錄(_B)..."
 
-#: src/textview.c:2006
+#: src/textview.c:2018
 msgid "Copy this add_ress"
 msgstr "複製此通訊地址(_R)"
 
-#: src/textview.c:2009
+#: src/textview.c:2021
 msgid "_Open with Web browser"
 msgstr "以瀏覽器開啟(_O)"
 
-#: src/textview.c:2011
+#: src/textview.c:2023
 msgid "Copy this _link"
 msgstr "複製此連接(_L)"
 
-#: src/textview.c:2154
+#: src/textview.c:2166
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6766,7 +6781,7 @@ msgstr ""
 "\n"
 "確定要開啟嗎？"
 
-#: src/textview.c:2159
+#: src/textview.c:2171
 msgid "Fake URL warning"
 msgstr "假的 URL 警告訊息"